diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 3 | ||||
| -rw-r--r-- | config/locales/fr.yml | 3 | ||||
| -rw-r--r-- | config/settings.yml | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 78654b1fb..e559d01c2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -354,6 +354,8 @@ en: setting_rest_api_enabled: Enable REST web service setting_cache_formatted_text: Cache formatted text setting_default_notification_option: Default notification option + setting_commit_logtime_enabled: Enable time logging + setting_commit_logtime_activity_id: Activity for logged time permission_add_project: Create project permission_add_subprojects: Create subprojects @@ -875,6 +877,7 @@ en: text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded." text_load_default_configuration: Load the default configuration text_status_changed_by_changeset: "Applied in changeset {{value}}." + text_time_logged_by_changeset: "Applied in changeset {{value}}." text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' text_select_project_modules: 'Select modules to enable for this project:' text_default_administrator_account_changed: Default administrator account changed diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 350c38dbd..897c6312f 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -358,6 +358,8 @@ fr: setting_gravatar_default: Image Gravatar par défaut setting_start_of_week: Jour de début des calendriers setting_cache_formatted_text: Mettre en cache le texte formaté + setting_commit_logtime_enabled: Permettre la saisie de temps + setting_commit_logtime_activity_id: Activité pour le temps saisi permission_add_project: Créer un projet permission_add_subprojects: Créer des sous-projets @@ -857,6 +859,7 @@ fr: text_no_configuration_data: "Les rôles, trackers, statuts et le workflow ne sont pas encore paramétrés.\nIl est vivement recommandé de charger le paramétrage par defaut. Vous pourrez le modifier une fois chargé." text_load_default_configuration: Charger le paramétrage par défaut text_status_changed_by_changeset: "Appliqué par commit {{value}}." + text_time_logged_by_changeset: "Appliqué par commit {{value}}" text_issues_destroy_confirmation: 'Êtes-vous sûr de vouloir supprimer le(s) demandes(s) selectionnée(s) ?' text_select_project_modules: 'Sélectionner les modules à activer pour ce projet :' text_default_administrator_account_changed: Compte administrateur par défaut changé diff --git a/config/settings.yml b/config/settings.yml index 2d32decb3..74647eb5a 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -98,6 +98,11 @@ commit_fix_status_id: default: 0 commit_fix_done_ratio: default: 100 +commit_logtime_enabled: + default: 0 +commit_logtime_activity_id: + format: int + default: 0 # autologin duration in days # 0 means autologin is disabled autologin: |