Add i18n and change variables to snake cased

maestrano · Oct 17, 2016 · f966fe4 · f966fe4
1 parent d043cc2
commit f966fe4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/app/views/apps/modals/app-settings-modal.coffee b/src/app/views/apps/modals/app-settings-modal.coffee
@@ -28,6 +28,7 @@ angular.module 'mnoEnterpriseAngular'
     # ----------------------------------------------------------
     $scope.helper = {}
     $scope.helper.canDeleteApp = ->
+      console.log(app)
       MnoeOrganizations.can.destroy.appInstance()
 
     $scope.helper.canDisplayBilling = ->

diff --git a/src/app/views/apps/modals/app-settings-modal.html b/src/app/views/apps/modals/app-settings-modal.html
@@ -34,14 +34,14 @@ <h3><b>{{ 'mno_enterprise.templates.impac.dock.settings.settings' | translate }}
       <!-- Billing Details -->
       <div ng-show="helper.canDisplayBilling()">
         <hr>
-        <div ng-show="!!app.freeTrialEndAt">
-            Free Trial: {{ app.freeTrialEndAt }}
+        <div ng-show="!!app.free_trial_end_at">
+            {{ 'mno_enterprise.templates.impac.dock.settings.free_trial' | translate }}: {{ app.free_trial_end_at }}
         </div>
-        <div ng-show="!app.freeTrialEndAt && app.perUserLicence">
-          <ng-pluralize count="app.licencesCount" when="{'0': 'No users', '1': '1 user', 'other': '{{app.licencesCount | number}} users'}"
+        <div ng-show="!app.free_trial_end_at && app.per_user_licence">
+          <ng-pluralize count="app.licences_count" when="{'0': 'No users', '1': '1 user', 'other': '{{app.licences_count | number}} users'}"
              tooltip-placement="bottom" tooltip="This is the total number of people in your organization using {{app.name}}"></ng-pluralize>
         </div>
-        <div ng-show="!app.freeTrialEndAt && !app.perUserLicence">Pricing details inside your app</div>
+        <div ng-show="!app.app.free_trial_end_at  && !app.per_user_licence">{{ 'mno_enterprise.templates.impac.dock.settings.pricing_details' | translate }}</div>
       </div>
       <!-- Data Sharing -->
       <div ng-show="helper.isDataSyncShown(app) || helper.isDataDisconnectShown(app)">

diff --git a/src/locales/en.locale.json b/src/locales/en.locale.json
@@ -544,6 +544,8 @@
   "mno_enterprise.templates.impac.dock.settings.manual_data_sync": "Manual Data Sync",
   "mno_enterprise.templates.impac.dock.settings.disconnect_link": "Disconnect Link",
   "mno_enterprise.templates.impac.dock.settings.delete": "Delete",
+  "mno_enterprise.templates.impac.dock.settings.pricing_details": "Pricing details inside your app",
+  "mno_enterprise.templates.impac.dock.settings.free_trial": "Free Trial",
   "mno_enterprise.templates.impac.dock.settings.confirm_app_deletion": "Confirm app deletion",
   "mno_enterprise.templates.impac.dock.settings.please_note_this_app": "Please note this app is on a monthly plan. Your billing for this app will be calculated pro rata.",
   "mno_enterprise.templates.impac.dock.settings.delete_instructions": "In order to delete your app, please enter the following statement in the box below.",