From dc1d085dd1dd9c9236356120156cf599ebb7a5ea Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 25 May 2016 22:16:19 +0200 Subject: [PATCH] translate yes/no field --- public/modules/forms/base/config/i18n/english.js | 8 ++++++++ public/modules/forms/base/config/i18n/french.js | 2 ++ .../forms/base/views/directiveViews/field/yes_no.html | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/public/modules/forms/base/config/i18n/english.js b/public/modules/forms/base/config/i18n/english.js index a07e3286..e5edbc50 100644 --- a/public/modules/forms/base/config/i18n/english.js +++ b/public/modules/forms/base/config/i18n/english.js @@ -28,10 +28,18 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid DELETE: 'Delete', CANCEL: 'Cancel', UPLOAD_FILE: 'Upload your File', +<<<<<<< 04151ddc774be8fe7230557c3695e9d16fade1e6 <<<<<<< 0e63943bc6423cb59a8a1be0d0fc09f1cd9fcfcd ======= SUBMIT: 'Submit' >>>>>>> translate submit button +======= + SUBMIT: 'Submit', + Y: 'Y', + N: 'N', + YES: 'Yes', + NO: 'No' +>>>>>>> translate yes/no field }); $translateProvider.preferredLanguage('english') diff --git a/public/modules/forms/base/config/i18n/french.js b/public/modules/forms/base/config/i18n/french.js index 0b980232..69310d8a 100644 --- a/public/modules/forms/base/config/i18n/french.js +++ b/public/modules/forms/base/config/i18n/french.js @@ -28,6 +28,8 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid CANCEL: 'RĂ©initialiser', SUBMIT: 'Enregistrer', UPLOAD_FILE: 'Envoyer un fichier', + Y: 'O', + N: 'N', }); }]); diff --git a/public/modules/forms/base/views/directiveViews/field/yes_no.html b/public/modules/forms/base/views/directiveViews/field/yes_no.html index 4ebfe0dc..ea8cada9 100644 --- a/public/modules/forms/base/views/directiveViews/field/yes_no.html +++ b/public/modules/forms/base/views/directiveViews/field/yes_no.html @@ -32,7 +32,7 @@ ng-change="$root.nextField()" ng-disabled="field.disabled" />
- Y + {{ 'Y' | translate }}
{{ 'YES' | translate }} @@ -59,7 +59,7 @@ ng-disabled="field.disabled"/>
- N + {{ 'N' | translate }}
{{ 'NO' | translate }}