From 7abbf317ee96bf40402b5e5c43db22d12b9b047f Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 25 Mar 2015 21:49:15 -0400 Subject: [PATCH] CRM-16141 - Fix untranslated strings in CaseType UI --- js/angular-crmCaseType.js | 4 +- partials/crmCaseType/activitySetDetails.html | 6 +-- partials/crmCaseType/activityTypesTable.html | 8 ++-- partials/crmCaseType/caseTypeDetails.html | 4 +- partials/crmCaseType/edit.html | 47 ++++++++++---------- partials/crmCaseType/list.html | 26 +++++------ partials/crmCaseType/rolesTable.html | 10 ++--- partials/crmCaseType/sequenceTable.html | 6 +-- partials/crmCaseType/timelineTable.html | 14 +++--- 9 files changed, 63 insertions(+), 62 deletions(-) diff --git a/js/angular-crmCaseType.js b/js/angular-crmCaseType.js index cb5e5797a5..d7b9b2086a 100644 --- a/js/angular-crmCaseType.js +++ b/js/angular-crmCaseType.js @@ -303,6 +303,8 @@ }); crmCaseType.controller('CaseTypeListCtrl', function($scope, crmApi, caseTypes) { + var ts = $scope.ts = CRM.ts(null); + $scope.caseTypes = caseTypes.values; $scope.toggleCaseType = function (caseType) { caseType.is_active = (caseType.is_active == '1') ? '0' : '1'; @@ -315,7 +317,7 @@ $scope.deleteCaseType = function (caseType) { crmApi('CaseType', 'delete', {id: caseType.id}, { error: function (data) { - CRM.alert(data.error_message, ts('Error')); + CRM.alert(data.error_message, ts('Error'), 'error'); } }) .then(function (data) { diff --git a/partials/crmCaseType/activitySetDetails.html b/partials/crmCaseType/activitySetDetails.html index 4b4be9bd3a..44a6c061b9 100644 --- a/partials/crmCaseType/activitySetDetails.html +++ b/partials/crmCaseType/activitySetDetails.html @@ -5,13 +5,13 @@ Required vars: activitySet - + - + - + diff --git a/partials/crmCaseType/activityTypesTable.html b/partials/crmCaseType/activityTypesTable.html index 724ef6e2a6..a721292472 100644 --- a/partials/crmCaseType/activityTypesTable.html +++ b/partials/crmCaseType/activityTypesTable.html @@ -5,8 +5,8 @@ Required vars: caseType
Label{{ts('Label')}}
Name{{ts('Name')}} @@ -19,7 +19,7 @@ Required vars: activitySet
Workflow{{ts('Workflow')}} {{ getWorkflowName(activitySet) }}
- - + + @@ -21,7 +21,7 @@ Required vars: caseType @@ -29,7 +29,7 @@ Required vars: caseType
Activity TypeMax Instances{{ts('Activity Type')}}{{ts('Max Instances')}}
- +
- Add activity type: + {{ts('Add activity type:')}}
- WARNING: The case type name includes deprecated characters. + {{ts('WARNING: The case type name includes deprecated characters.')}}
- WARNING: If any external files or programs reference the old "Name", then they must be updated manually. + {{ts('WARNING: If any external files or programs reference the old "Name", then they must be updated manually.')}}
diff --git a/partials/crmCaseType/edit.html b/partials/crmCaseType/edit.html index 93ec51e837..300007c2d3 100644 --- a/partials/crmCaseType/edit.html +++ b/partials/crmCaseType/edit.html @@ -5,43 +5,43 @@ Required vars: caseType
- Use this screen to define or update the Case Roles, Activity Types, and Timelines for a case type (learn more...). + {{ts('Use this screen to define or update the Case Roles, Activity Types, and Timelines for a case type.')}} {{ts('Learn more...')}}).
- - - - - - + +
-

Roles

+

{{ts('Roles')}}

-

Activities

+

{{ts('Activities')}}

@@ -53,20 +53,19 @@ Required vars: caseType
-
- - - - - - + +
diff --git a/partials/crmCaseType/list.html b/partials/crmCaseType/list.html index a4d08bd17b..73ce281eb8 100644 --- a/partials/crmCaseType/list.html +++ b/partials/crmCaseType/list.html @@ -3,16 +3,16 @@ Controller: CaseTypeListsCtrl Required vars: caseTypes -->
- A Case Type describes a group of related tasks, interactions, or processes. + {{ts('A Case Type describes a group of related tasks, interactions, or processes.')}}
- - - - + + + + @@ -25,39 +25,39 @@ Required vars: caseTypes - +
TitleNameDescriptionEnabled?{{ts('Title')}}{{ts('Name')}}{{ts('Description')}}{{ts('Enabled?')}}
{{caseType.title}} {{caseType.name}} {{caseType.description}}{{caseType.is_active == 1 ? 'Yes' : 'No'}}{{caseType.is_active == 1 ? ts('Yes') : ts('No')}} - Edit + {{ts('Edit')}} - more + {{ts('more')}} @@ -69,5 +69,5 @@ Required vars: caseTypes
-
New Case Type +
{{ts('New Case Type')}}
\ No newline at end of file diff --git a/partials/crmCaseType/rolesTable.html b/partials/crmCaseType/rolesTable.html index 57bd47f2bb..93a7a963ef 100644 --- a/partials/crmCaseType/rolesTable.html +++ b/partials/crmCaseType/rolesTable.html @@ -5,9 +5,9 @@ Required vars: caseType - - - + + + @@ -17,7 +17,7 @@ Required vars: caseType @@ -25,7 +25,7 @@ Required vars: caseType - + @@ -17,7 +17,7 @@ Required vars: activitySet {{ activity.name }} @@ -25,7 +25,7 @@ Required vars: activitySet - - - - - + + + + + @@ -67,7 +67,7 @@ Required vars: activitySet crm-icon="trash" ng-show="isActivityRemovable(activitySet, activity)" ng-click="removeItem(activitySet.activityTypes, activity)" - title="Remove"> + title="{{ts('Remove')}}"> @@ -76,7 +76,7 @@ Required vars: activitySet
NameAssign to CreatorIs Manager{{ts('Name')}}{{ts('Assign to Creator')}}{{ts('Is Manager')}}
- +
- Add role: + {{ts('Add role:')}}
Activity{{ts('Activity')}}
- +
- Add activity: + {{ts('Add activity:')}}
ActivityStatusReferenceOffsetSelect{{ts('Activity')}}{{ts('Status')}}{{ts('Reference')}}{{ts('Offset')}}{{ts('Select')}}
- Add activity: + {{ts('Add activity:')}}