diff --git a/mayan/apps/common/forms.py b/mayan/apps/common/forms.py index 99e530152c..5940805146 100644 --- a/mayan/apps/common/forms.py +++ b/mayan/apps/common/forms.py @@ -50,7 +50,7 @@ class FormOptions(object): determined in the following order: as passed via keyword arguments during form intialization, as form get_... method or finally as static Meta options. This is to allow a form with - Meta options or method to be overrided at initialization + Meta options or method to be overridden at initialization and increase the usability of a single class. """ for name, default_value in self.option_definitions.items(): diff --git a/mayan/apps/smart_settings/apps.py b/mayan/apps/smart_settings/apps.py index cb94eea4e2..35ee315f98 100644 --- a/mayan/apps/smart_settings/apps.py +++ b/mayan/apps/smart_settings/apps.py @@ -39,7 +39,7 @@ class SmartSettingsApp(MayanAppConfig): attribute='serialized_value', label=_('Value'), source=Setting ) SourceColumn( - attribute='is_overrided', source=Setting, widget=TwoStateWidget + attribute='is_overridden', source=Setting, widget=TwoStateWidget ) menu_object.bind_links( diff --git a/mayan/apps/smart_settings/classes.py b/mayan/apps/smart_settings/classes.py index 47c40f951d..a262b1b6e5 100644 --- a/mayan/apps/smart_settings/classes.py +++ b/mayan/apps/smart_settings/classes.py @@ -344,12 +344,12 @@ class Setting(object): def invalidate_cache(self): self.loaded = False - def is_overrided(self): + def is_overridden(self): return self.environment_variable - is_overrided.short_description = _('Overrided') - is_overrided.help_text = _( - 'Is this settings being overrided by an environment variable?' + is_overridden.short_description = _('Overridden') + is_overridden.help_text = _( + 'Is this settings being overridden by an environment variable?' ) def migrate(self): diff --git a/mayan/apps/smart_settings/locale/ar/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/ar/LC_MESSAGES/django.po index 75f7045d09..bc2867f491 100644 --- a/mayan/apps/smart_settings/locale/ar/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/ar/LC_MESSAGES/django.po @@ -34,11 +34,11 @@ msgid "Value" msgstr "قيمة" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/bg/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/bg/LC_MESSAGES/django.po index ccafead026..a5e005b5d6 100644 --- a/mayan/apps/smart_settings/locale/bg/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/bg/LC_MESSAGES/django.po @@ -35,11 +35,11 @@ msgid "Value" msgstr "Стойност" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "Отменено с друга настройка" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "Отменят ли се тези настройки с променлива на средата?" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/bs_BA/LC_MESSAGES/django.po index a00d78c66f..82fe626f81 100644 --- a/mayan/apps/smart_settings/locale/bs_BA/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/bs_BA/LC_MESSAGES/django.po @@ -35,11 +35,11 @@ msgid "Value" msgstr "Vrijednost" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/cs/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/cs/LC_MESSAGES/django.po index 5be5292d9a..c6ae00659f 100644 --- a/mayan/apps/smart_settings/locale/cs/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/cs/LC_MESSAGES/django.po @@ -35,11 +35,11 @@ msgid "Value" msgstr "Hodnota" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/da_DK/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/da_DK/LC_MESSAGES/django.po index 5dba11b963..0f70759c48 100644 --- a/mayan/apps/smart_settings/locale/da_DK/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/da_DK/LC_MESSAGES/django.po @@ -35,11 +35,11 @@ msgid "Value" msgstr "Værdi" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.po index e85b12e7ae..1b2beca02c 100644 --- a/mayan/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.po @@ -37,11 +37,11 @@ msgid "Value" msgstr "Wert" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/el/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/el/LC_MESSAGES/django.po index d0845040d8..a69eb40a4f 100644 --- a/mayan/apps/smart_settings/locale/el/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/el/LC_MESSAGES/django.po @@ -34,11 +34,11 @@ msgid "Value" msgstr "Τιμή" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/en/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/en/LC_MESSAGES/django.po index 9581318ff0..250c8048cf 100644 --- a/mayan/apps/smart_settings/locale/en/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/en/LC_MESSAGES/django.po @@ -34,11 +34,11 @@ msgid "Value" msgstr "" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/es/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/es/LC_MESSAGES/django.po index d2119c405a..7fb93aff10 100644 --- a/mayan/apps/smart_settings/locale/es/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/es/LC_MESSAGES/django.po @@ -37,11 +37,11 @@ msgid "Value" msgstr "Valor" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "Anulado" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "¿Esta configuración está siendo anulada por una variable de entorno?" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/fa/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/fa/LC_MESSAGES/django.po index b1464b15a5..7186c7277f 100644 --- a/mayan/apps/smart_settings/locale/fa/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/fa/LC_MESSAGES/django.po @@ -36,11 +36,11 @@ msgid "Value" msgstr "مقدار" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/fr/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/fr/LC_MESSAGES/django.po index 7f99127376..b37ebc707a 100644 --- a/mayan/apps/smart_settings/locale/fr/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/fr/LC_MESSAGES/django.po @@ -38,11 +38,11 @@ msgid "Value" msgstr "Valeur" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/hu/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/hu/LC_MESSAGES/django.po index 5d6ffc9af8..5a3e0ea1fb 100644 --- a/mayan/apps/smart_settings/locale/hu/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/hu/LC_MESSAGES/django.po @@ -35,11 +35,11 @@ msgid "Value" msgstr "Érték" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/id/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/id/LC_MESSAGES/django.po index c28a65992e..8129ca2799 100644 --- a/mayan/apps/smart_settings/locale/id/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/id/LC_MESSAGES/django.po @@ -34,11 +34,11 @@ msgid "Value" msgstr "" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/it/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/it/LC_MESSAGES/django.po index 1237a3c1bd..5f4f6b2d6b 100644 --- a/mayan/apps/smart_settings/locale/it/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/it/LC_MESSAGES/django.po @@ -35,11 +35,11 @@ msgid "Value" msgstr "Valore" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/lv/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/lv/LC_MESSAGES/django.po index 057c8431bf..ac448a798d 100644 --- a/mayan/apps/smart_settings/locale/lv/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/lv/LC_MESSAGES/django.po @@ -35,11 +35,11 @@ msgid "Value" msgstr "Vērtība" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.po index 7876affcb8..9f0cc506b9 100644 --- a/mayan/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.po @@ -35,11 +35,11 @@ msgid "Value" msgstr "Waarde" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/pl/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/pl/LC_MESSAGES/django.po index c10c9c5a70..302548c1f3 100644 --- a/mayan/apps/smart_settings/locale/pl/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/pl/LC_MESSAGES/django.po @@ -38,11 +38,11 @@ msgid "Value" msgstr "Wartość" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/pt/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/pt/LC_MESSAGES/django.po index b61375cb69..4f0f999e22 100644 --- a/mayan/apps/smart_settings/locale/pt/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/pt/LC_MESSAGES/django.po @@ -34,11 +34,11 @@ msgid "Value" msgstr "Valor" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.po index c54a930b50..e9fb899d3f 100644 --- a/mayan/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.po @@ -37,11 +37,11 @@ msgid "Value" msgstr "Valor" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/ro_RO/LC_MESSAGES/django.po index 9c19fb1a1f..7eeba858e2 100644 --- a/mayan/apps/smart_settings/locale/ro_RO/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/ro_RO/LC_MESSAGES/django.po @@ -35,11 +35,11 @@ msgid "Value" msgstr "Valoare" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/ru/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/ru/LC_MESSAGES/django.po index c7e9ff5089..3e4daf7fd3 100644 --- a/mayan/apps/smart_settings/locale/ru/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/ru/LC_MESSAGES/django.po @@ -35,11 +35,11 @@ msgid "Value" msgstr "Значение" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/sl_SI/LC_MESSAGES/django.po index befb05a5b5..a1b0582719 100644 --- a/mayan/apps/smart_settings/locale/sl_SI/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/sl_SI/LC_MESSAGES/django.po @@ -34,11 +34,11 @@ msgid "Value" msgstr "" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/tr_TR/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/tr_TR/LC_MESSAGES/django.po index aa711c40ef..049ea634dc 100644 --- a/mayan/apps/smart_settings/locale/tr_TR/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/tr_TR/LC_MESSAGES/django.po @@ -36,11 +36,11 @@ msgid "Value" msgstr "Değer" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/vi_VN/LC_MESSAGES/django.po index 83ffb86e42..0ddb93b83f 100644 --- a/mayan/apps/smart_settings/locale/vi_VN/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/vi_VN/LC_MESSAGES/django.po @@ -34,11 +34,11 @@ msgid "Value" msgstr "Giá trị" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14 diff --git a/mayan/apps/smart_settings/locale/zh/LC_MESSAGES/django.po b/mayan/apps/smart_settings/locale/zh/LC_MESSAGES/django.po index 708a4832d4..00a6862e68 100644 --- a/mayan/apps/smart_settings/locale/zh/LC_MESSAGES/django.po +++ b/mayan/apps/smart_settings/locale/zh/LC_MESSAGES/django.po @@ -35,11 +35,11 @@ msgid "Value" msgstr "值" #: classes.py:350 -msgid "Overrided" +msgid "Overridden" msgstr "" #: classes.py:352 -msgid "Is this settings being overrided by an environment variable?" +msgid "Is this settings being overridden by an environment variable?" msgstr "" #: forms.py:14