From 7d65f0161b5f56a91e3f49487486a0d1adc8b571 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Sun, 29 Oct 2017 12:07:42 -0700 Subject: [PATCH] removed duplicate translation keyword for form admin panel --- .../forms/admin/config/i18n/english.js | 2 +- .../modules/forms/admin/config/i18n/french.js | 2 +- .../modules/forms/admin/config/i18n/german.js | 2 +- .../forms/admin/config/i18n/italian.js | 2 +- .../forms/admin/config/i18n/spanish.js | 2 +- .../services/form-fields.client.service.js | 2 +- .../field-icon.client.directive.test.js | 58 +++++++++++++++++++ 7 files changed, 64 insertions(+), 6 deletions(-) diff --git a/public/modules/forms/admin/config/i18n/english.js b/public/modules/forms/admin/config/i18n/english.js index 84e5a848..3759d236 100644 --- a/public/modules/forms/admin/config/i18n/english.js +++ b/public/modules/forms/admin/config/i18n/english.js @@ -153,7 +153,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid MULTIPLE_CHOICE: 'Multiple Choice', DROPDOWN: 'Dropdown', DATE: 'Date', - PARAGRAPH_T: 'Paragraph', + PARAGRAPH_FIELD: 'Paragraph', YES_NO: 'Yes/No', LEGAL: 'Legal', RATING: 'Rating', diff --git a/public/modules/forms/admin/config/i18n/french.js b/public/modules/forms/admin/config/i18n/french.js index cc2187e8..d9675934 100644 --- a/public/modules/forms/admin/config/i18n/french.js +++ b/public/modules/forms/admin/config/i18n/french.js @@ -152,7 +152,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid MULTIPLE_CHOICE: 'Choix multiple', DROPDOWN: 'Menu Déroulant', DATE: 'Date', - PARAGRAPH_T: "Paragraphe", + PARAGRAPH_FIELD: "Paragraphe", OUI_NON: 'Oui / Non', LEGAL: 'Légal', RATING: "Évaluation", diff --git a/public/modules/forms/admin/config/i18n/german.js b/public/modules/forms/admin/config/i18n/german.js index 77d40107..fa3dd2b3 100644 --- a/public/modules/forms/admin/config/i18n/german.js +++ b/public/modules/forms/admin/config/i18n/german.js @@ -151,7 +151,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid MULTIPLE_CHOICE: 'Mehrfachauswahl', DROPDOWN: 'Dropdown-Liste', DATE: 'Datum', - PARAGRAPH_T: "Absatz", + PARAGRAPH_FIELD: "Absatz", YES_NO: 'Ja / Nein', LEGAL: "Rechtliche", RATING: 'Bewertung', diff --git a/public/modules/forms/admin/config/i18n/italian.js b/public/modules/forms/admin/config/i18n/italian.js index 17665625..1414e891 100644 --- a/public/modules/forms/admin/config/i18n/italian.js +++ b/public/modules/forms/admin/config/i18n/italian.js @@ -152,7 +152,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid MULTIPLE_CHOICE: 'Scelta multipla', DROPDOWN: 'Dropdown', DATE: 'Data', - PARAGRAPH_T: 'Paragrafo', + PARAGRAPH_FIELD: 'Paragrafo', YES_NO: 'Sì / no', LEGAL: 'Legale', RATING: 'Valutazione', diff --git a/public/modules/forms/admin/config/i18n/spanish.js b/public/modules/forms/admin/config/i18n/spanish.js index 8e0985ed..26c7199d 100644 --- a/public/modules/forms/admin/config/i18n/spanish.js +++ b/public/modules/forms/admin/config/i18n/spanish.js @@ -153,7 +153,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid MULTIPLE_CHOICE: 'Opciones múltiples', DROPDOWN: 'Desplegable', DATE: 'Fecha', - PARAGRAPH_T: 'Párrafo', + PARAGRAPH_FIELD: 'Párrafo', YES_NO: 'Si/No', LEGAL: 'Legal', RATING: 'Puntaje', diff --git a/public/modules/forms/admin/services/form-fields.client.service.js b/public/modules/forms/admin/services/form-fields.client.service.js index dd1d7dec..6b7c050c 100644 --- a/public/modules/forms/admin/services/form-fields.client.service.js +++ b/public/modules/forms/admin/services/form-fields.client.service.js @@ -28,7 +28,7 @@ angular.module('forms').service('FormFields', [ '$rootScope', '$translate', '$wi }, { name : 'textarea', - value : $translate.instant('PARAGRAPH'), + value : $translate.instant('PARAGRAPH_FIELD'), }, { name : 'yes_no', diff --git a/public/modules/forms/tests/unit/directives/field-icon.client.directive.test.js b/public/modules/forms/tests/unit/directives/field-icon.client.directive.test.js index fbb89193..14ca515a 100644 --- a/public/modules/forms/tests/unit/directives/field-icon.client.directive.test.js +++ b/public/modules/forms/tests/unit/directives/field-icon.client.directive.test.js @@ -25,6 +25,64 @@ 'number': 'fa fa-slack' }; + //Mock FormFields Service + beforeEach(module(function($provide) { + $provide.service('FormFields', function() { + return { + types: [ + { + name : 'textfield', + value : 'Short Text' + }, + { + name : 'email', + value : 'Email' + }, + { + name : 'radio', + value : 'Muliple Choice' + }, + { + name : 'dropdown', + value : 'Dropdown' + }, + { + name : 'date', + value : 'Date' + }, + { + name : 'textarea', + value : 'Paragraph', + }, + { + name : 'yes_no', + value : 'Yes/No', + }, + { + name : 'legal', + value : 'Legal', + }, + { + name : 'rating', + value : 'Rating', + }, + { + name : 'link', + value : 'Link', + }, + { + name : 'number', + value : 'Numbers', + }, + { + name : 'statement', + value : 'Statement' + } + ] + }; + }); + })); + // Load the main application module beforeEach(module(ApplicationConfiguration.applicationModuleName));