Repository: liqd/a4-opin

Issue:
Organisation information | Add "...we will use OPIN"
Hey hey, here are two sentences that are incomplete and hard to understand for new initiators. It is in the organization information, section "about the Organisation".
1) "Description why" change into "Description why are we part of OPIN"
2) "Description how" change into "Description how we will use OPIN"
Great thanks! 

![bildschirmfoto 2017-03-13 um 17 38 59](https://cloud.githubusercontent.com/assets/13625047/23864952/605ed728-0814-11e7-8d76-0028dcf2cf16.png)



Discussion:

Resolving patch:
diff --git a/euth/contrib/management/commands/makemessages.py b/euth/contrib/management/commands/makemessages.py
--- a/euth/contrib/management/commands/makemessages.py
+++ b/euth/contrib/management/commands/makemessages.py
@@ -1,15 +1,32 @@
-from os.path import relpath
+from os import path
+from django.conf import settings
 from django.core.management.commands import makemessages
-import adhocracy4
-import euth
-import euth_wagtail
+
+
+def get_module_dir(name):
+    module = __import__(name)
+    return path.dirname(module.__file__)
 
 
 class Command(makemessages.Command):
+    msgmerge_options = (
+        makemessages.Command.msgmerge_options + ['--no-fuzzy-matching']
+    )
+
+    def handle(self, *args, **options):
+        if options['domain'] == 'djangojs':
+            if options['extensions'] is None:
+                options['extensions'] = ['js', 'jsx']
+        return super().handle(*args, **options)
+
     def find_files(self, root):
-        a4_path = super().find_files(adhocracy4.__path__[0])
-        euth_path = super().find_files(relpath(euth.__path__[0]))
-        euth_wagtail_path = super().find_files(
-            relpath(euth_wagtail.__path__[0])
+        a4js_paths = super().find_files(
+            path.join(settings.BASE_DIR, 'node_modules', 'adhocracy4')
+        )
+        a4_paths = super().find_files(get_module_dir('adhocracy4'))
+        euth_paths = super().find_files(path.relpath(get_module_dir('euth')))
+        euth_wagtail_paths = super().find_files(
+            path.relpath(get_module_dir('euth_wagtail'))
         )
-        return a4_path + euth_path + euth_wagtail_path
+
+        return a4js_paths + a4_paths + euth_paths + euth_wagtail_paths
diff --git a/euth/dashboard/forms.py b/euth/dashboard/forms.py
--- a/euth/dashboard/forms.py
+++ b/euth/dashboard/forms.py
@@ -446,15 +446,23 @@ class OrganisationForm(forms.ModelForm):
 
     translated_fields = [
         ('title', forms.CharField, {
-            'help_text': _('The title of your organisation')
+            'help_text': _('The title of your organisation'),
+            'label': _('title')
         }),
-        ('description_why', forms.CharField, {'widget': forms.Textarea}),
-        ('description_how', forms.CharField, {'widget': forms.Textarea}),
-        ('description', forms.CharField, {
+        ('description_why', forms.CharField, {
+            'label': _('description why'),
+            'widget': forms.Textarea,
+        }),
+        ('description_how', forms.CharField, {
             'widget': forms.Textarea,
+            'label': _('description how')
+        }),
+        ('description', forms.CharField, {
+            'label': _('description'),
             'help_text': _(
                 'More info about the organisation / '
-                'Short text for organisation overview')
+                'Short text for organisation overview'),
+            'widget': forms.Textarea,
         })
     ]
     languages = [lang_code for lang_code, lang in settings.LANGUAGES]
@@ -476,13 +484,9 @@ def __init__(self, *args, **kwargs):
         for lang_code in self.languages:
             for name, field_cls, kwargs in self.translated_fields:
                 self.instance.set_current_language(lang_code)
-                translated_field = field_cls(**kwargs)
-                label = name.replace('_', ' ').capitalize()
+                field = field_cls(**kwargs)
                 identifier = self._get_identifier(
                     lang_code, name)
-
-                field = translated_field
-                field.label = label
                 field.required = False
 
                 try:


Test patch: