Merge branch 'versions/micro' into 'versions/micro'

Settings: Display overridden instead of overrided

See merge request mayan-edms/mayan-edms!65

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():

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(

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):

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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