jro_apps/redmine Commit - r582:9c38458f8bd2

0

app/helpers/application_helper.rb +7 -2

               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)

0

app/views/settings/edit.rhtml +3 0

             <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>

0

config/settings.yml +6 0

@@ -66,3 +66,9 commit_fix_status_id:
66	autologin:	66	autologin:
67	format: int	67	format: int
68	default: 0	68	default: 0
		69	# date format
		70	# 0: language based
		71	# 1: ISO format
		72	date_format:
		73	format: int
		74	default: 0

0

lang/bg.yml +2 0

             setting_commit_ref_keywords: Отбелязващи ключови думи
             setting_commit_fix_keywords: Приключващи ключови думи
             setting_autologin: Autologin
+            setting_date_format: Date format
             label_user: Потребител
             label_user_plural: Потребители
             label_week: Week
             label_date_from: From
             label_date_to: To
+            label_language_based: Language based
             button_login: Вход
             button_submit: Изпращане

0

lang/de.yml +2 0

             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
             label_week: Week
             label_date_from: From
             label_date_to: To
+            label_language_based: Language based
             button_login: Einloggen
             button_submit: OK

0

lang/en.yml +2 0

             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
             label_week: Week
             label_date_from: From
             label_date_to: To
+            label_language_based: Language based
             button_login: Login
             button_submit: Submit

0

lang/es.yml +2 0

             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
             label_week: Week
             label_date_from: From
             label_date_to: To
+            label_language_based: Language based
             button_login: Conexión
             button_submit: Someter

0

lang/fr.yml +2 0

             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
             label_week: Semaine
             label_date_from: Du
             label_date_to: Au
+            label_language_based: Basé sur la langue
             button_login: Connexion
             button_submit: Soumettre

0

lang/it.yml +2 0

             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
             label_week: Week
             label_date_from: From
             label_date_to: To
+            label_language_based: Language based
             button_login: Login
             button_submit: Invia

0

lang/ja.yml +2 0

             setting_commit_ref_keywords: 参照用キーワード
             setting_commit_fix_keywords: 修正用キーワード
             setting_autologin: 自動ログイン
+            setting_date_format: Date format
             label_user: ユーザ
             label_user_plural: ユーザ
             label_week: Week
             label_date_from: From
             label_date_to: To
+            label_language_based: Language based
             button_login: ログイン
             button_submit: 変更

0

lang/nl.yml +2 0

             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
             label_week: Week
             label_date_from: From
             label_date_to: To
+            label_language_based: Language based
             button_login: Inloggen
             button_submit: Toevoegen

0

lang/pt-br.yml +2 0

             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
             label_week: Week
             label_date_from: From
             label_date_to: To
+            label_language_based: Language based
             button_login: Login
             button_submit: Enviar

0

lang/pt.yml +2 0

             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
             label_week: Week
             label_date_from: From
             label_date_to: To
+            label_language_based: Language based
             button_login: Login
             button_submit: Enviar

0

lang/sv.yml +2 0

             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
             label_week: Week
             label_date_from: From
             label_date_to: To
+            label_language_based: Language based
             button_login: Logga in
             button_submit: Skicka

0

lang/zh.yml +2 0

             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: 用户列表
             label_week: Week
             label_date_from: From
             label_date_to: To
+            label_language_based: Language based
             button_login: 登录
             button_submit: 提交

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages