Feature #2691 » 0002-Add-option-to-force-default-language-for-non-logged-.patch
| app/controllers/application_controller.rb | ||
|---|---|---|
| 95 | 95 |
if User.current.logged? |
| 96 | 96 |
lang = find_language(User.current.language) |
| 97 | 97 |
end |
| 98 |
lang ||= Setting.default_language |
|
| 98 |
lang ||= Setting.default_language if Setting.force_default_language?
|
|
| 99 | 99 |
if lang.blank? && request.env['HTTP_ACCEPT_LANGUAGE'] |
| 100 | 100 |
accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.downcase |
| 101 | 101 |
if !accept_lang.blank? |
| app/views/settings/_display.rhtml | ||
|---|---|---|
| 4 | 4 |
<p><label><%= l(:label_theme) %></label> |
| 5 | 5 |
<%= select_tag 'settings[ui_theme]', options_for_select( ([[l(:label_default), '']] + Redmine::Themes.themes.collect {|t| [t.name, t.id]}), Setting.ui_theme) %></p>
|
| 6 | 6 | |
| 7 |
<p><label><%= l(:setting_force_default_language) %></label> |
|
| 8 |
<%= hidden_field_tag 'settings[force_default_language]', 0 %> |
|
| 9 |
<%= check_box_tag 'settings[force_default_language]', 1, Setting.force_default_language? %></p> |
|
| 10 | ||
| 7 | 11 |
<p><label><%= l(:setting_default_language) %></label> |
| 8 |
<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(true), Setting.default_language) %></p>
|
|
| 12 |
<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
|
|
| 9 | 13 | |
| 10 | 14 |
<p><label><%= l(:setting_start_of_week) %></label> |
| 11 | 15 |
<%= select_tag 'settings[start_of_week]', options_for_select( [[l(:label_language_based), ''], [day_name(1),'1'], [day_name(7),'7']] , Setting.start_of_week) %></p> |
| config/environments/development.rb | ||
|---|---|---|
| 14 | 14 | |
| 15 | 15 |
# Don't care if the mailer can't send |
| 16 | 16 |
config.action_mailer.raise_delivery_errors = false |
| 17 | ||
| 18 |
config.action_controller.session = { :key => "_myapp_session", :secret => "06b97e42aa64752d82888def81bb7ae5f0b849c5c034f173fd9c44b4b190d29ea0d34c92b668aa445247d96acabcdfd3cd6573b80a17405266d8959dd95a9174" }
|
|
| config/locales/bg.yml | ||
|---|---|---|
| 236 | 236 |
setting_app_title: Заглавие |
| 237 | 237 |
setting_app_subtitle: Описание |
| 238 | 238 |
setting_welcome_text: Допълнителен текст |
| 239 |
setting_force_default_language: Force default language |
|
| 239 | 240 |
setting_default_language: Език по подразбиране |
| 240 | 241 |
setting_login_required: Изискване за вход в системата |
| 241 | 242 |
setting_self_registration: Регистрация от потребители |
| config/locales/bs.yml | ||
|---|---|---|
| 279 | 279 |
setting_app_title: Naslov aplikacije |
| 280 | 280 |
setting_app_subtitle: Podnaslov aplikacije |
| 281 | 281 |
setting_welcome_text: Tekst dobrodošlice |
| 282 |
setting_force_default_language: Force default language |
|
| 282 | 283 |
setting_default_language: Podrazumjevani jezik |
| 283 | 284 |
setting_login_required: Authentifikacija neophodna |
| 284 | 285 |
setting_self_registration: Samo-registracija |
| config/locales/ca.yml | ||
|---|---|---|
| 261 | 261 |
setting_app_title: "Títol de l'aplicació" |
| 262 | 262 |
setting_app_subtitle: "Subtítol de l'aplicació" |
| 263 | 263 |
setting_welcome_text: Text de benvinguda |
| 264 |
setting_force_default_language: Force default language |
|
| 264 | 265 |
setting_default_language: Idioma predeterminat |
| 265 | 266 |
setting_login_required: Es necessita autenticació |
| 266 | 267 |
setting_self_registration: Registre automàtic |
| config/locales/cs.yml | ||
|---|---|---|
| 255 | 255 |
setting_app_title: Název aplikace |
| 256 | 256 |
setting_app_subtitle: Podtitulek aplikace |
| 257 | 257 |
setting_welcome_text: Uvítací text |
| 258 |
setting_force_default_language: Force default language |
|
| 258 | 259 |
setting_default_language: Výchozí jazyk |
| 259 | 260 |
setting_login_required: Auten. vyžadována |
| 260 | 261 |
setting_self_registration: Povolena automatická registrace |
| config/locales/da.yml | ||
|---|---|---|
| 271 | 271 |
setting_app_title: Applikationstitel |
| 272 | 272 |
setting_app_subtitle: Applikationsundertekst |
| 273 | 273 |
setting_welcome_text: Velkomsttekst |
| 274 |
setting_force_default_language: Force default language |
|
| 274 | 275 |
setting_default_language: Standardsporg |
| 275 | 276 |
setting_login_required: Sikkerhed påkrævet |
| 276 | 277 |
setting_self_registration: Brugeroprettelse |
| config/locales/de.yml | ||
|---|---|---|
| 280 | 280 |
setting_app_title: Applikations-Titel |
| 281 | 281 |
setting_app_subtitle: Applikations-Untertitel |
| 282 | 282 |
setting_welcome_text: Willkommenstext |
| 283 |
setting_force_default_language: Force default language |
|
| 283 | 284 |
setting_default_language: Default-Sprache |
| 284 | 285 |
setting_login_required: Authentisierung erforderlich |
| 285 | 286 |
setting_self_registration: Anmeldung ermöglicht |
| config/locales/el.yml | ||
|---|---|---|
| 271 | 271 |
setting_app_title: Τίτλος εφαρμογής |
| 272 | 272 |
setting_app_subtitle: Υπότιτλος εφαρμογής |
| 273 | 273 |
setting_welcome_text: Κείμενο υποδοχής |
| 274 |
setting_force_default_language: Force default language |
|
| 274 | 275 |
setting_default_language: Προεπιλεγμένη γλώσσα |
| 275 | 276 |
setting_login_required: Απαιτείται πιστοποίηση |
| 276 | 277 |
setting_self_registration: Αυτο-εγγραφή |
| config/locales/en.yml | ||
|---|---|---|
| 276 | 276 |
setting_app_title: Application title |
| 277 | 277 |
setting_app_subtitle: Application subtitle |
| 278 | 278 |
setting_welcome_text: Welcome text |
| 279 |
setting_force_default_language: Force default language |
|
| 279 | 280 |
setting_default_language: Default language |
| 280 | 281 |
setting_login_required: Authentication required |
| 281 | 282 |
setting_self_registration: Self-registration |
| config/locales/es.yml | ||
|---|---|---|
| 750 | 750 |
setting_commit_ref_keywords: Palabras clave para la referencia |
| 751 | 751 |
setting_cross_project_issue_relations: Permitir relacionar peticiones de distintos proyectos |
| 752 | 752 |
setting_date_format: Formato de fecha |
| 753 |
setting_force_default_language: Force default language |
|
| 753 | 754 |
setting_default_language: Idioma por defecto |
| 754 | 755 |
setting_default_projects_public: Los proyectos nuevos son públicos por defecto |
| 755 | 756 |
setting_diff_max_lines_displayed: Número máximo de diferencias mostradas |
| config/locales/fi.yml | ||
|---|---|---|
| 284 | 284 |
setting_app_title: Ohjelman otsikko |
| 285 | 285 |
setting_app_subtitle: Ohjelman alaotsikko |
| 286 | 286 |
setting_welcome_text: Tervehdysteksti |
| 287 |
setting_force_default_language: Force default language |
|
| 287 | 288 |
setting_default_language: Vakiokieli |
| 288 | 289 |
setting_login_required: Pakollinen kirjautuminen |
| 289 | 290 |
setting_self_registration: Itserekisteröinti |
| config/locales/fr.yml | ||
|---|---|---|
| 298 | 298 |
setting_app_title: Titre de l'application |
| 299 | 299 |
setting_app_subtitle: Sous-titre de l'application |
| 300 | 300 |
setting_welcome_text: Texte d'accueil |
| 301 |
setting_force_default_language: Forcer la langue par défaut |
|
| 301 | 302 |
setting_default_language: Langue par défaut |
| 302 | 303 |
setting_login_required: Authentification obligatoire |
| 303 | 304 |
setting_self_registration: Inscription des nouveaux utilisateurs |
| config/locales/gl.yml | ||
|---|---|---|
| 729 | 729 |
setting_commit_ref_keywords: Palabras clave para a referencia |
| 730 | 730 |
setting_cross_project_issue_relations: Permitir relacionar peticións de distintos proxectos |
| 731 | 731 |
setting_date_format: Formato da data |
| 732 |
setting_force_default_language: Force default language |
|
| 732 | 733 |
setting_default_language: Idioma por defecto |
| 733 | 734 |
setting_default_projects_public: Os proxectos novos son públicos por defecto |
| 734 | 735 |
setting_diff_max_lines_displayed: Número máximo de diferencias mostradas |
| config/locales/he.yml | ||
|---|---|---|
| 249 | 249 |
setting_app_title: כותרת ישום |
| 250 | 250 |
setting_app_subtitle: תת-כותרת ישום |
| 251 | 251 |
setting_welcome_text: טקסט "ברוך הבא" |
| 252 |
setting_force_default_language: Force default language |
|
| 252 | 253 |
setting_default_language: שפת ברירת מחדל |
| 253 | 254 |
setting_login_required: דרוש אימות |
| 254 | 255 |
setting_self_registration: אפשר הרשמות עצמית |
| config/locales/hu.yml | ||
|---|---|---|
| 281 | 281 |
setting_app_title: Alkalmazás címe |
| 282 | 282 |
setting_app_subtitle: Alkalmazás alcíme |
| 283 | 283 |
setting_welcome_text: Üdvözlő üzenet |
| 284 |
setting_force_default_language: Force default language |
|
| 284 | 285 |
setting_default_language: Alapértelmezett nyelv |
| 285 | 286 |
setting_login_required: Azonosítás szükséges |
| 286 | 287 |
setting_self_registration: Regisztráció |
| config/locales/it.yml | ||
|---|---|---|
| 249 | 249 |
setting_app_title: Titolo applicazione |
| 250 | 250 |
setting_app_subtitle: Sottotitolo applicazione |
| 251 | 251 |
setting_welcome_text: Testo di benvenuto |
| 252 |
setting_force_default_language: Force default language |
|
| 252 | 253 |
setting_default_language: Lingua predefinita |
| 253 | 254 |
setting_login_required: Autenticazione richiesta |
| 254 | 255 |
setting_self_registration: Auto-registrazione abilitata |
| config/locales/ja.yml | ||
|---|---|---|
| 300 | 300 |
setting_app_title: アプリケーションのタイトル |
| 301 | 301 |
setting_app_subtitle: アプリケーションのサブタイトル |
| 302 | 302 |
setting_welcome_text: ウェルカムメッセージ |
| 303 |
setting_force_default_language: Force default language |
|
| 303 | 304 |
setting_default_language: 既定の言語 |
| 304 | 305 |
setting_login_required: 認証が必要 |
| 305 | 306 |
setting_self_registration: ユーザは自分で登録できる |
| config/locales/ko.yml | ||
|---|---|---|
| 327 | 327 |
setting_app_title: 레드마인 제목 |
| 328 | 328 |
setting_app_subtitle: 레드마인 부제목 |
| 329 | 329 |
setting_welcome_text: 환영 메시지 |
| 330 |
setting_force_default_language: Force default language |
|
| 330 | 331 |
setting_default_language: 기본 언어 |
| 331 | 332 |
setting_login_required: 인증이 필요함 |
| 332 | 333 |
setting_self_registration: 사용자 직접등록 |
| config/locales/lt.yml | ||
|---|---|---|
| 340 | 340 |
setting_app_title: Programos pavadinimas |
| 341 | 341 |
setting_app_subtitle: Programos paantraštė |
| 342 | 342 |
setting_welcome_text: Pasveikinimas |
| 343 |
setting_force_default_language: Force default language |
|
| 343 | 344 |
setting_default_language: Numatytoji kalba |
| 344 | 345 |
setting_login_required: Reikalingas autentiškumo nustatymas |
| 345 | 346 |
setting_self_registration: Saviregistracija |
| config/locales/nl.yml | ||
|---|---|---|
| 691 | 691 |
setting_commit_ref_keywords: Refererende trefwoorden |
| 692 | 692 |
setting_cross_project_issue_relations: Sta crossproject issuerelaties toe |
| 693 | 693 |
setting_date_format: Datumformaat |
| 694 |
setting_force_default_language: Force default language |
|
| 694 | 695 |
setting_default_language: Standaard taal |
| 695 | 696 |
setting_default_projects_public: Nieuwe projecten zijn standaard publiek |
| 696 | 697 |
setting_diff_max_lines_displayed: Max number of diff lines displayed |
| config/locales/no.yml | ||
|---|---|---|
| 253 | 253 |
setting_app_title: Applikasjonstittel |
| 254 | 254 |
setting_app_subtitle: Applikasjonens undertittel |
| 255 | 255 |
setting_welcome_text: Velkomsttekst |
| 256 |
setting_force_default_language: Force default language |
|
| 256 | 257 |
setting_default_language: Standardspråk |
| 257 | 258 |
setting_login_required: Krever innlogging |
| 258 | 259 |
setting_self_registration: Selvregistrering |
| config/locales/pl.yml | ||
|---|---|---|
| 729 | 729 |
setting_commit_ref_keywords: Słowa tworzące powiązania |
| 730 | 730 |
setting_cross_project_issue_relations: Zezwól na powiązania zagadnień między projektami |
| 731 | 731 |
setting_date_format: Format daty |
| 732 |
setting_force_default_language: Force default language |
|
| 732 | 733 |
setting_default_language: Domyślny język |
| 733 | 734 |
setting_default_projects_public: Nowe projekty są domyślnie publiczne |
| 734 | 735 |
setting_display_subprojects_issues: Domyślnie pokazuj zagadnienia podprojektów w głównym projekcie |
| config/locales/pt-BR.yml | ||
|---|---|---|
| 287 | 287 |
setting_app_title: Título da aplicação |
| 288 | 288 |
setting_app_subtitle: Sub-título da aplicação |
| 289 | 289 |
setting_welcome_text: Texto de boas-vindas |
| 290 |
setting_force_default_language: Force default language |
|
| 290 | 291 |
setting_default_language: Idioma padrão |
| 291 | 292 |
setting_login_required: Exigir autenticação |
| 292 | 293 |
setting_self_registration: Permitido Auto-registro |
| config/locales/pt.yml | ||
|---|---|---|
| 272 | 272 |
setting_app_title: Título da aplicação |
| 273 | 273 |
setting_app_subtitle: Sub-título da aplicação |
| 274 | 274 |
setting_welcome_text: Texto de boas vindas |
| 275 |
setting_force_default_language: Force default language |
|
| 275 | 276 |
setting_default_language: Língua por omissão |
| 276 | 277 |
setting_login_required: Autenticação obrigatória |
| 277 | 278 |
setting_self_registration: Auto-registo |
| config/locales/ro.yml | ||
|---|---|---|
| 259 | 259 |
setting_app_title: Titlu aplicație |
| 260 | 260 |
setting_app_subtitle: Subtitlu aplicație |
| 261 | 261 |
setting_welcome_text: Text de întâmpinare |
| 262 |
setting_force_default_language: Force default language |
|
| 262 | 263 |
setting_default_language: Limba implicita |
| 263 | 264 |
setting_login_required: Necesita autentificare |
| 264 | 265 |
setting_self_registration: Înregistrare automată |
| config/locales/ru.yml | ||
|---|---|---|
| 827 | 827 |
setting_commit_ref_keywords: Ключевые слова для поиска |
| 828 | 828 |
setting_cross_project_issue_relations: Разрешить пересечение задач по проектам |
| 829 | 829 |
setting_date_format: Формат даты |
| 830 |
setting_force_default_language: Force default language |
|
| 830 | 831 |
setting_default_language: Язык по умолчанию |
| 831 | 832 |
setting_default_projects_public: Новые проекты являются общедоступными |
| 832 | 833 |
setting_diff_max_lines_displayed: Максимальное число строк для diff |
| config/locales/sk.yml | ||
|---|---|---|
| 253 | 253 |
setting_app_title: Názov aplikácie |
| 254 | 254 |
setting_app_subtitle: Podtitulok aplikácie |
| 255 | 255 |
setting_welcome_text: Uvítací text |
| 256 |
setting_force_default_language: Force default language |
|
| 256 | 257 |
setting_default_language: Východzí jazyk |
| 257 | 258 |
setting_login_required: Auten. vyžadovaná |
| 258 | 259 |
setting_self_registration: Povolenie registrácie |
| config/locales/sl.yml | ||
|---|---|---|
| 255 | 255 |
setting_app_title: Naslov aplikacije |
| 256 | 256 |
setting_app_subtitle: Podnaslov aplikacije |
| 257 | 257 |
setting_welcome_text: Pozdravno besedilo |
| 258 |
setting_force_default_language: Force default language |
|
| 258 | 259 |
setting_default_language: Privzeti jezik |
| 259 | 260 |
setting_login_required: Zahtevano overovljanje |
| 260 | 261 |
setting_self_registration: Samostojna registracija |
| config/locales/sr.yml | ||
|---|---|---|
| 261 | 261 |
setting_app_title: Naziv aplikacije |
| 262 | 262 |
setting_app_subtitle: Podnaslov aplikacije |
| 263 | 263 |
setting_welcome_text: Tekst dobrodošlice |
| 264 |
setting_force_default_language: Force default language |
|
| 264 | 265 |
setting_default_language: Podrazumevani jezik |
| 265 | 266 |
setting_login_required: Prijavljivanje je obavezno |
| 266 | 267 |
setting_self_registration: Samoregistracija je dozvoljena |
| config/locales/sv.yml | ||
|---|---|---|
| 320 | 320 |
setting_app_title: Applikationsrubrik |
| 321 | 321 |
setting_app_subtitle: Applikationsunderrubrik |
| 322 | 322 |
setting_welcome_text: Välkomsttext |
| 323 |
setting_force_default_language: Force default language |
|
| 323 | 324 |
setting_default_language: Standardspråk |
| 324 | 325 |
setting_login_required: Kräver inloggning |
| 325 | 326 |
setting_self_registration: Självregistrering |
| config/locales/th.yml | ||
|---|---|---|
| 251 | 251 |
setting_app_title: ชื่อโปรแกรม |
| 252 | 252 |
setting_app_subtitle: ชื่อโปรแกรมรอง |
| 253 | 253 |
setting_welcome_text: ข้อความต้อนรับ |
| 254 |
setting_force_default_language: Force default language |
|
| 254 | 255 |
setting_default_language: ภาษาเริ่มต้น |
| 255 | 256 |
setting_login_required: ต้องป้อนผู้ใช้-รหัสผ่าน |
| 256 | 257 |
setting_self_registration: ลงทะเบียนด้วยตนเอง |
| config/locales/tr.yml | ||
|---|---|---|
| 282 | 282 |
setting_app_title: Uygulama Bağlığı |
| 283 | 283 |
setting_app_subtitle: Uygulama alt başlığı |
| 284 | 284 |
setting_welcome_text: Hoşgeldin Mesajı |
| 285 |
setting_force_default_language: Force default language |
|
| 285 | 286 |
setting_default_language: Varsayılan Dil |
| 286 | 287 |
setting_login_required: Kimlik denetimi gerekli mi |
| 287 | 288 |
setting_self_registration: Otomatik kayıt |
| config/locales/uk.yml | ||
|---|---|---|
| 243 | 243 |
setting_app_title: Назва додатку |
| 244 | 244 |
setting_app_subtitle: Підзаголовок додатку |
| 245 | 245 |
setting_welcome_text: Текст привітання |
| 246 |
setting_force_default_language: Force default language |
|
| 246 | 247 |
setting_default_language: Стандартна мова |
| 247 | 248 |
setting_login_required: Необхідна аутентифікація |
| 248 | 249 |
setting_self_registration: Можлива само-реєстрація |
| config/locales/vi.yml | ||
|---|---|---|
| 317 | 317 |
setting_app_title: Tựa đề ứng dụng |
| 318 | 318 |
setting_app_subtitle: Tựa đề nhỏ của ứng dụng |
| 319 | 319 |
setting_welcome_text: Thông điệp chào mừng |
| 320 |
setting_force_default_language: Force default language |
|
| 320 | 321 |
setting_default_language: Ngôn ngữ mặc định |
| 321 | 322 |
setting_login_required: Cần đăng nhập |
| 322 | 323 |
setting_self_registration: Tự chứng thực |
| config/locales/zh-TW.yml | ||
|---|---|---|
| 364 | 364 |
setting_app_title: 標題 |
| 365 | 365 |
setting_app_subtitle: 副標題 |
| 366 | 366 |
setting_welcome_text: 歡迎詞 |
| 367 |
setting_force_default_language: Force default language |
|
| 367 | 368 |
setting_default_language: 預設語系 |
| 368 | 369 |
setting_login_required: 需要驗證 |
| 369 | 370 |
setting_self_registration: 註冊選項 |
| config/locales/zh.yml | ||
|---|---|---|
| 294 | 294 |
setting_app_title: 应用程序标题 |
| 295 | 295 |
setting_app_subtitle: 应用程序子标题 |
| 296 | 296 |
setting_welcome_text: 欢迎文字 |
| 297 |
setting_force_default_language: Force default language |
|
| 297 | 298 |
setting_default_language: 默认语言 |
| 298 | 299 |
setting_login_required: 要求认证 |
| 299 | 300 |
setting_self_registration: 允许自注册 |
| config/settings.yml | ||
|---|---|---|
| 55 | 55 |
default: textile |
| 56 | 56 |
wiki_compression: |
| 57 | 57 |
default: "" |
| 58 |
force_default_language: |
|
| 59 |
default: 0 |
|
| 58 | 60 |
default_language: |
| 59 | 61 |
default: en |
| 60 | 62 |
host_name: |
- « Previous
- 1
- 2
- 3
- Next »