summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-11-18 12:42:20 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-11-18 12:42:20 +0000
commit5495e6f3424f44faa16b4d03dfe1e76a30e50469 (patch)
treef37543a819979725a0a916af660e49095ff303e3 /config
parent9c3e3a4276612f60552379518ab8c9a11319e73b (diff)
downloadredmine-5495e6f3424f44faa16b4d03dfe1e76a30e50469.tar.gz
redmine-5495e6f3424f44faa16b4d03dfe1e76a30e50469.zip
Introduce a setting to change the display format of timespans to h:mm (#23996).
Patch by Jens Kraemer. git-svn-id: http://svn.redmine.org/redmine/trunk@15965 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
-rw-r--r--config/locales/de.yml1
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/locales/fr.yml1
-rw-r--r--config/settings.yml2
4 files changed, 5 insertions, 0 deletions
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5bdb484a7..60db8a608 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1047,6 +1047,7 @@ de:
setting_thumbnails_enabled: Vorschaubilder von Dateianhängen anzeigen
setting_thumbnails_size: Größe der Vorschaubilder (in Pixel)
setting_time_format: Zeitformat
+ setting_timespan_format: Format für Zeitspannen
setting_unsubscribe: Erlaubt Benutzern das eigene Benutzerkonto zu löschen
setting_user_format: Benutzer-Anzeigeformat
setting_welcome_text: Willkommenstext
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 56a06c7d5..eae146951 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -389,6 +389,7 @@ en:
setting_autologin: Autologin
setting_date_format: Date format
setting_time_format: Time format
+ setting_timespan_format: Time span format
setting_cross_project_issue_relations: Allow cross-project issue relations
setting_cross_project_subtasks: Allow cross-project subtasks
setting_issue_list_default_columns: Default columns displayed on the issue list
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index d0ef34c46..95c5bf9dc 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -401,6 +401,7 @@ fr:
setting_autologin: Durée maximale de connexion automatique
setting_date_format: Format de date
setting_time_format: Format d'heure
+ setting_timespan_format: Format des temps en heures
setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets
setting_cross_project_subtasks: Autoriser les sous-tâches dans des projets différents
setting_issue_list_default_columns: Colonnes affichées par défaut sur la liste des demandes
diff --git a/config/settings.yml b/config/settings.yml
index 807f9b7a7..b9a82583f 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -153,6 +153,8 @@ date_format:
default: ''
time_format:
default: ''
+timespan_format:
+ default: 'decimal'
user_format:
default: :firstname_lastname
format: symbol