From 9c38458f8bd259c7db2cb6a8fda7dcbcbf3f5540 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 14 Jul 2007 13:29:20 +0000 Subject: [PATCH] Added an option to choose the date format: language based (as defined in each lang file) or ISO 8601 (YYYY-MM-DD). This option can be set in Admin -> Settings. git-svn-id: http://redmine.rubyforge.org/svn/trunk@585 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 9 +++++++-- app/views/settings/edit.rhtml | 3 +++ config/settings.yml | 6 ++++++ lang/bg.yml | 2 ++ lang/de.yml | 2 ++ lang/en.yml | 2 ++ lang/es.yml | 2 ++ lang/fr.yml | 2 ++ lang/it.yml | 2 ++ lang/ja.yml | 2 ++ lang/nl.yml | 2 ++ lang/pt-br.yml | 2 ++ lang/pt.yml | 2 ++ lang/sv.yml | 2 ++ lang/zh.yml | 2 ++ 15 files changed, 40 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5e3146ca..7bb80999 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -78,11 +78,16 @@ module ApplicationHelper end def format_date(date) - l_date(date) if date + return nil unless date + @date_format_setting ||= Setting.date_format.to_i + @date_format_setting == 0 ? l_date(date) : date.strftime("%Y-%m-%d") end def format_time(time) - l_datetime((time.is_a? String) ? time.to_time : time) if time + return nil unless time + @date_format_setting ||= Setting.date_format.to_i + time = time.to_time if time.is_a?(String) + @date_format_setting == 0 ? l_datetime(time) : (time.strftime("%Y-%m-%d") + ' ' + l_time(time)) end def day_name(day) diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml index ad068209..08648493 100644 --- a/app/views/settings/edit.rhtml +++ b/app/views/settings/edit.rhtml @@ -15,6 +15,9 @@

<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %>

+

+<%= select_tag 'settings[date_format]', options_for_select( [[l(:label_language_based), '0'], ['ISO 8601 (YYYY-MM-DD)', '1']], Setting.date_format) %>

+

<%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB

diff --git a/config/settings.yml b/config/settings.yml index 39e2e853..924f0d3b 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -66,3 +66,9 @@ commit_fix_status_id: autologin: format: int default: 0 +# date format +# 0: language based +# 1: ISO format +date_format: + format: int + default: 0 diff --git a/lang/bg.yml b/lang/bg.yml index 3d632273..9fd8b370 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -172,6 +172,7 @@ setting_sys_api_enabled: Разрешаване на WS за управлени setting_commit_ref_keywords: Отбелязващи ключови думи setting_commit_fix_keywords: Приключващи ключови думи setting_autologin: Autologin +setting_date_format: Date format label_user: Потребител label_user_plural: Потребители @@ -402,6 +403,7 @@ label_month: Month label_week: Week label_date_from: From label_date_to: To +label_language_based: Language based button_login: Вход button_submit: Изпращане diff --git a/lang/de.yml b/lang/de.yml index 03e7002f..2e7522ce 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -172,6 +172,7 @@ setting_sys_api_enabled: Enable WS for repository management setting_commit_ref_keywords: Referencing keywords setting_commit_fix_keywords: Fixing keywords setting_autologin: Autologin +setting_date_format: Date format label_user: Benutzer label_user_plural: Benutzer @@ -402,6 +403,7 @@ label_month: Month label_week: Week label_date_from: From label_date_to: To +label_language_based: Language based button_login: Einloggen button_submit: OK diff --git a/lang/en.yml b/lang/en.yml index e24a2f53..f6c89d23 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -172,6 +172,7 @@ setting_sys_api_enabled: Enable WS for repository management setting_commit_ref_keywords: Referencing keywords setting_commit_fix_keywords: Fixing keywords setting_autologin: Autologin +setting_date_format: Date format label_user: User label_user_plural: Users @@ -402,6 +403,7 @@ label_month: Month label_week: Week label_date_from: From label_date_to: To +label_language_based: Language based button_login: Login button_submit: Submit diff --git a/lang/es.yml b/lang/es.yml index 8c4a0ba9..d866b829 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -172,6 +172,7 @@ setting_sys_api_enabled: Enable WS for repository management setting_commit_ref_keywords: Referencing keywords setting_commit_fix_keywords: Fixing keywords setting_autologin: Autologin +setting_date_format: Date format label_user: Usuario label_user_plural: Usuarios @@ -402,6 +403,7 @@ label_month: Month label_week: Week label_date_from: From label_date_to: To +label_language_based: Language based button_login: Conexión button_submit: Someter diff --git a/lang/fr.yml b/lang/fr.yml index 34449c2c..788ec2b5 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -172,6 +172,7 @@ setting_sys_api_enabled: Activer les WS pour la gestion des dépôts setting_commit_ref_keywords: Mot-clés de référencement setting_commit_fix_keywords: Mot-clés de résolution setting_autologin: Autologin +setting_date_format: Format de date label_user: Utilisateur label_user_plural: Utilisateurs @@ -402,6 +403,7 @@ label_month: Mois label_week: Semaine label_date_from: Du label_date_to: Au +label_language_based: Basé sur la langue button_login: Connexion button_submit: Soumettre diff --git a/lang/it.yml b/lang/it.yml index 583c3b7c..74f1c1ea 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -172,6 +172,7 @@ setting_sys_api_enabled: Abilita WS per la gestione del repository setting_commit_ref_keywords: Referencing keywords setting_commit_fix_keywords: Fixing keywords setting_autologin: Autologin +setting_date_format: Date format label_user: Utente label_user_plural: Utenti @@ -402,6 +403,7 @@ label_month: Month label_week: Week label_date_from: From label_date_to: To +label_language_based: Language based button_login: Login button_submit: Invia diff --git a/lang/ja.yml b/lang/ja.yml index a7f4b54c..216e176e 100644 --- a/lang/ja.yml +++ b/lang/ja.yml @@ -173,6 +173,7 @@ setting_sys_api_enabled: リポジトリ管理用のWeb Serviceを有効化す setting_commit_ref_keywords: 参照用キーワード setting_commit_fix_keywords: 修正用キーワード setting_autologin: 自動ログイン +setting_date_format: Date format label_user: ユーザ label_user_plural: ユーザ @@ -403,6 +404,7 @@ label_month: Month label_week: Week label_date_from: From label_date_to: To +label_language_based: Language based button_login: ログイン button_submit: 変更 diff --git a/lang/nl.yml b/lang/nl.yml index 34b6897c..a71c496b 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -172,6 +172,7 @@ setting_sys_api_enabled: Gebruik WS voor repository beheer setting_commit_ref_keywords: Referencing keywords setting_commit_fix_keywords: Fixing keywords setting_autologin: Autologin +setting_date_format: Date format label_user: Gebruiker label_user_plural: Gebruikers @@ -402,6 +403,7 @@ label_month: Month label_week: Week label_date_from: From label_date_to: To +label_language_based: Language based button_login: Inloggen button_submit: Toevoegen diff --git a/lang/pt-br.yml b/lang/pt-br.yml index c3702788..21d08d05 100644 --- a/lang/pt-br.yml +++ b/lang/pt-br.yml @@ -172,6 +172,7 @@ setting_sys_api_enabled: Ativa WS para gerenciamento do repositorio setting_commit_ref_keywords: Referencing keywords setting_commit_fix_keywords: Fixing keywords setting_autologin: Autologin +setting_date_format: Date format label_user: Usuario label_user_plural: Usuarios @@ -402,6 +403,7 @@ label_month: Month label_week: Week label_date_from: From label_date_to: To +label_language_based: Language based button_login: Login button_submit: Enviar diff --git a/lang/pt.yml b/lang/pt.yml index 09236a34..2c1fe9f1 100644 --- a/lang/pt.yml +++ b/lang/pt.yml @@ -172,6 +172,7 @@ setting_sys_api_enabled: Ativa WS para gerenciamento do repositório setting_commit_ref_keywords: Palavras-chave de referôncia setting_commit_fix_keywords: Palavras-chave fixas setting_autologin: Autologin +setting_date_format: Date format label_user: Usuário label_user_plural: Usuários @@ -402,6 +403,7 @@ label_month: Month label_week: Week label_date_from: From label_date_to: To +label_language_based: Language based button_login: Login button_submit: Enviar diff --git a/lang/sv.yml b/lang/sv.yml index f56ef2ef..4f000369 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -172,6 +172,7 @@ setting_sys_api_enabled: Aktivera WS för repository management setting_commit_ref_keywords: Referencing keywords setting_commit_fix_keywords: Fixing keywords setting_autologin: Autologin +setting_date_format: Date format label_user: Användare label_user_plural: Användare @@ -402,6 +403,7 @@ label_month: Month label_week: Week label_date_from: From label_date_to: To +label_language_based: Language based button_login: Logga in button_submit: Skicka diff --git a/lang/zh.yml b/lang/zh.yml index 850c9b56..88dfdca4 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -175,6 +175,7 @@ setting_sys_api_enabled: Enable WS for repository management setting_commit_ref_keywords: Referencing keywords setting_commit_fix_keywords: Fixing keywords setting_autologin: Autologin +setting_date_format: Date format label_user: 用户 label_user_plural: 用户列表 @@ -404,6 +405,7 @@ label_month: Month label_week: Week label_date_from: From label_date_to: To +label_language_based: Language based button_login: 登录 button_submit: 提交 -- 2.11.0