Skip to content

Commit

Permalink
Make settings attributes overridable (PR #68)
Browse files Browse the repository at this point in the history
  • Loading branch information
agusmakmun committed Jun 29, 2019
1 parent fda3674 commit 6e9fd52
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ martor |pypi version|
.. image:: https://img.shields.io/pypi/pyversions/martor.svg
:target: https://pypi.python.org/pypi/martor

.. image:: https://img.shields.io/badge/Django-1.8,%201.9,%201.10,%201.11,%202.0,%202.1-green.svg
.. image:: https://img.shields.io/badge/Django-1.8%20%3E=%202.2-green.svg
:target: https://www.djangoproject.com

.. image:: https://travis-ci.org/agusmakmun/django-markdown-editor.svg?branch=master
Expand Down
2 changes: 1 addition & 1 deletion martor/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-

__VERSION__ = '1.4.0'
__VERSION__ = '1.4.1'
__AUTHOR__ = 'Agus Makmun (Summon Agus)'
__AUTHOR_EMAIL__ = 'summon.agus@gmail.com'
Binary file modified martor/locale/en/LC_MESSAGES/django.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion martor/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-18 07:30+0700\n"
"POT-Creation-Date: 2019-06-30 05:47+0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
Binary file modified martor/locale/id/LC_MESSAGES/django.mo
Binary file not shown.
6 changes: 4 additions & 2 deletions martor/locale/id/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-18 07:19+0700\n"
"POT-Creation-Date: 2019-06-30 05:48+0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -138,7 +138,9 @@ msgstr "Permintaan tidak valid"
#: views.py:75
#, python-format
msgid "No users registered as `%(username)s` or user is unactived."
msgstr "Tidak ada pengguna terdaftar sebagai `%(username)s` atau pengguna telah nonaktif."
msgstr ""
"Tidak ada pengguna terdaftar sebagai `%(username)s` atau pengguna telah "
"nonaktif."

#: views.py:81
msgid "Validation Failed for field `username`"
Expand Down
4 changes: 2 additions & 2 deletions martor/static/martor/css/martor-admin.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions martor/static/martor/css/martor.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions martor/static/martor/js/martor.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Name : Martor v1.4.0
* Name : Martor v1.4.1
* Created by : Agus Makmun (Summon Agus)
* Release date : 02-Mar-2019
* Release date : 30-Jun-2019
* License : GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
* Repository : https://github.com/agusmakmun/django-markdown-editor
**/
Expand Down
4 changes: 2 additions & 2 deletions martor/static/martor/js/martor.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions martor_demo/martor_demo/settings.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
"""
Django settings for martor_demo project.
Generated by 'django-admin startproject' using Django 2.1.5.
Generated by 'django-admin startproject' using Django 2.2.2.
For more information on this file, see
https://docs.djangoproject.com/en/2.0/topics/settings/
https://docs.djangoproject.com/en/2.2/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/2.0/ref/settings/
https://docs.djangoproject.com/en/2.2/ref/settings/
"""

import os
Expand All @@ -18,7 +18,7 @@


# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = '93fs*#h77*vj&2#2f+!y=kifg0s&63768398a(kx126itq(*6r'
Expand Down Expand Up @@ -78,7 +78,7 @@


# Database
# https://docs.djangoproject.com/en/2.0/ref/settings/#databases
# https://docs.djangoproject.com/en/2.2/ref/settings/#databases

DATABASES = {
'default': {
Expand All @@ -89,7 +89,7 @@


# Password validation
# https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators
# https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators

AUTH_PASSWORD_VALIDATORS = [
{
Expand All @@ -108,7 +108,7 @@


# Internationalization
# https://docs.djangoproject.com/en/2.0/topics/i18n/
# https://docs.djangoproject.com/en/2.2/topics/i18n/

LANGUAGE_CODE = 'en-us'

Expand All @@ -122,7 +122,7 @@


# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/2.0/howto/static-files/
# https://docs.djangoproject.com/en/2.2/howto/static-files/

STATIC_URL = '/static/'
MEDIA_URL = '/media/'
Expand Down
2 changes: 1 addition & 1 deletion martor_demo/martor_demo/urls.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""martor_demo URL Configuration
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/2.0/topics/http/urls/
https://docs.djangoproject.com/en/2.2/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
Expand Down
2 changes: 1 addition & 1 deletion martor_demo/martor_demo/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
It exposes the WSGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/2.0/howto/deployment/wsgi/
https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/
"""

import os
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def get_requirements():
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Framework :: Django :: 2.2',
'Intended Audience :: Developers',
'Operating System :: OS Independent',
'Programming Language :: JavaScript',
Expand Down

0 comments on commit 6e9fd52

Please sign in to comment.