diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-01-24 10:28:12 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-01-24 10:28:12 +0000 |
| commit | e391be40866f720ddc47398bb51e63e551935de3 (patch) | |
| tree | d0bf0d5efd8e020e0bf9b03a2e07f3bbc0a2eb25 /config | |
| parent | 6e6c6fac5caf92103a54e0c8f76a06f5f1b3b4f4 (diff) | |
| download | redmine-e391be40866f720ddc47398bb51e63e551935de3.tar.gz redmine-e391be40866f720ddc47398bb51e63e551935de3.zip | |
Adds settings for disabling browser language detection and language preference (#2691).
git-svn-id: http://svn.redmine.org/redmine/trunk@12691 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/locales/fr.yml | 2 | ||||
| -rw-r--r-- | config/settings.yml | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index f9b459577..c9256ae40 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -408,6 +408,8 @@ en: setting_jsonp_enabled: Enable JSONP support setting_default_projects_tracker_ids: Default trackers for new projects setting_mail_handler_excluded_filenames: Exclude attachments by name + setting_force_default_language_for_anonymous: Force default language for anonymous users + setting_force_default_language_for_loggedin: Force default language for logged-in users permission_add_project: Create project permission_add_subprojects: Create subprojects diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 29bb08428..2eff8fcd3 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -405,6 +405,8 @@ fr: setting_jsonp_enabled: Activer le support JSONP setting_default_projects_tracker_ids: Trackers par défaut pour les nouveaux projets setting_mail_handler_excluded_filenames: Exclure les fichiers attachés par leur nom + setting_force_default_language_for_anonymous: Forcer la langue par défault pour les utilisateurs anonymes + setting_force_default_language_for_loggedin: Forcer la langue par défault pour les utilisateurs identifiés permission_add_project: Créer un projet permission_add_subprojects: Créer des sous-projets diff --git a/config/settings.yml b/config/settings.yml index 66c67bd01..832f68501 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -69,6 +69,10 @@ wiki_compression: default: "" default_language: default: en +force_default_language_for_anonymous: + default: 0 +force_default_language_for_loggedin: + default: 0 host_name: default: localhost:3000 protocol: |