Merge branch 'master' into log_system

config/packages/php_translation.yaml

@@ -1,5 +1,5 @@
 translation:
-    locales: ["en", "de"]
+    locales: ["en", "de", "ru"]
     edit_in_place:
         enabled: false
         config_name: app

config/packages/twig.yaml

@@ -13,3 +13,4 @@ twig:
         default_currency: '%default_currency%'
         global_theme: '%global_theme%'
         allow_email_pw_reset: '%allow_email_pw_reset%'
+        locale_menu: '%locale_menu%'

config/services.yaml

@@ -20,9 +20,11 @@ parameters:
     sender_email: 'noreply@partdb.changeme' # The email address from which all emails are sent from
     sender_name: 'Part-DB Mailer' # The name that will be used for all mails sent by Part-DB
     allow_email_pw_reset: '%env(validMailDSN:MAILER_DSN)%' # Config if users are able, to reset their password by email. By default this enabled, when a mail server is configured.
+    locale_menu: ['en', 'de', 'ru'] # The languages that are shown in user drop down menu
     # If this option is activated, IP addresses are anonymized to be GPDR compliant
     gpdr_compliance: true
 
+
 services:
     # default configuration for services in *this* file
     _defaults:

templates/_navbar.html.twig

@@ -50,12 +50,11 @@
                     </div>
                     <li role="separator" class="dropdown-divider"></li>
                     <h6 class="dropdown-header">{% trans %}user.language_select{% endtrans %}</h6>
-                    <a class="dropdown-item" data-no-ajax href="{{ path(app.request.attributes.get('_route'),
+                    {% for locale in locale_menu %}
-                        app.request.attributes.get('_route_params')|merge({'_locale': 'en'})) }}">
+                        <a class="dropdown-item" data-no-ajax href="{{ path(app.request.attributes.get('_route'),
-                        {% trans %}language.english{% endtrans %}</a>
+                            app.request.attributes.get('_route_params')|merge({'_locale': locale})) }}">
-                    <a class="dropdown-item" data-no-ajax href="{{ path(app.request.attributes.get('_route'),
+                            {{ locale|language_name }} ({{ locale|upper }})</a>
-                        app.request.attributes.get('_route_params')|merge({'_locale': 'de'})) }}">
+                    {% endfor %}
-                        {% trans %}language.german{% endtrans %}</a>
                 </ul>
             </li>
         </ul>