Added an option to choose the date format: language based (as defined in each lang...

This option can be set in Admin -> Settings.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@585 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5e3146c..7bb8099 100644 (file)
--- 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 ad06820..0864849 100644 (file)
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -15,6 +15,9 @@
 <p><label><%= l(:setting_default_language) %></label>
 <%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
 
+<p><label><%= l(:setting_date_format) %></label>
+<%= select_tag 'settings[date_format]', options_for_select( [[l(:label_language_based), '0'], ['ISO 8601 (YYYY-MM-DD)', '1']], Setting.date_format) %></p>
+
 <p><label><%= l(:setting_attachment_max_size) %></label>
 <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
 

diff --git a/config/settings.yml b/config/settings.yml
index 39e2e85..924f0d3 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -66,3 +66,9 @@ commit_fix_status_id:
 autologin:\r
   format: int\r
   default: 0\r
+# date format\r
+# 0: language based\r
+# 1: ISO format\r
+date_format:\r
+  format: int\r
+  default: 0\r

diff --git a/lang/bg.yml b/lang/bg.yml
index 3d63227..9fd8b37 100644 (file)
--- 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 03e7002..2e7522c 100644 (file)
--- 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 e24a2f5..f6c89d2 100644 (file)
--- 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 8c4a0ba..d866b82 100644 (file)
--- 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 34449c2..788ec2b 100644 (file)
--- 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 583c3b7..74f1c1e 100644 (file)
--- 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 a7f4b54..216e176 100644 (file)
--- 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 34b6897..a71c496 100644 (file)
--- 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 c370278..21d08d0 100644 (file)
--- 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\r
 setting_commit_fix_keywords: Fixing keywords\r
 setting_autologin: Autologin\r
+setting_date_format: Date format\r
 \r
 label_user: Usuario\r
 label_user_plural: Usuarios\r
@@ -402,6 +403,7 @@ label_month: Month
 label_week: Week\r
 label_date_from: From\r
 label_date_to: To\r
+label_language_based: Language based\r
 \r
 button_login: Login\r
 button_submit: Enviar\r

diff --git a/lang/pt.yml b/lang/pt.yml
index 09236a3..2c1fe9f 100644 (file)
--- 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 f56ef2e..4f00036 100644 (file)
--- 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 850c9b5..88dfdca 100644 (file)
--- 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: 提交