fix(UI): Update string loading in chart and rules

Signed-off-by: Chris Jackson <chris@cd-jackson.com>
openhab · Jun 12, 2016 · dd2e6f7 · dd2e6f7
1 parent edcfb93
commit dd2e6f7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/src/app/automation/rules.js b/src/app/automation/rules.js
@@ -33,8 +33,11 @@ angular.module('HABmin.rules', [
             data: {pageTitle: 'Rules'},
             resolve: {
                 // Make sure the localisation files are resolved before the controller runs
-                localisations: function (locale) {
-                    return locale.ready('habmin');
+                localisations: function ($q, locale) {
+                    return $q.all([
+                        locale.ready('habmin'),
+                        locale.ready('rule')
+                    ]);
                 }
             }
         });
@@ -67,7 +70,7 @@ angular.module('HABmin.rules', [
             onLoad: function (editor) {
                 $scope.aceEditor = editor;
             },
-            onChange: function(e) {
+            onChange: function (e) {
 
             }
         };

diff --git a/src/app/chart/chart.js b/src/app/chart/chart.js
@@ -45,7 +45,8 @@ angular.module('HABmin.chart', [
                 localisations: function ($q, locale) {
                     return $q.all([
                         locale.ready('common'),
-                        locale.ready('habmin')
+                        locale.ready('habmin'),
+                        locale.ready('chart')
                     ]);
                 }
             }

diff --git a/src/app/tools/zwave/logService.js b/src/app/tools/zwave/logService.js
@@ -615,6 +615,14 @@ function ZWaveLogReader() {
             name: "SCENE_ACTIVATION",
             processor: null
         },
+        44: {
+            name: "SCENE_ACTUATOR_CONF",
+            processor: null
+        },
+        45: {
+            name: "SCENE_CONTROLLER_CONF",
+            processor: null
+        },
         48: {
             name: "SENSOR_BINARY",
             commands: {

diff --git a/src/index.html b/src/index.html
@@ -255,20 +255,20 @@ <h4>
                         <i class="fa fa-angle-left pull-right"></i>
                     </a>
                     <ul class="treeview-menu">
-                        <li ui-sref="rules">
-                            <a>
+                        <li>
+                            <a ui-sref="rules">
                                 <i class="fa fa-fw fa-puzzle-piece"></i>
                                 <span i18n="habmin.Rules"></span>
                             </a>
                         </li>
-                        <li ui-sref="scheduler">
-                            <a>
+                        <li>
+                            <a ui-sref="scheduler">
                                 <i class="fa fa-fw fa-clock-o"></i>
                                 <span i18n="habmin.Scheduler"></span>
                             </a>
                         </li>
-                        <li ui-sref="scheduler" class="disabled">
-                            <a>
+                        <li>
+                            <a ui-sref="scheduler" class="disabled">
                                 <i class="fa fa-fw fa-at"></i>
                                 <span i18n="habmin.Notifications"></span>
                             </a>

diff --git a/src/languages/en-GB/services.lang.json b/src/languages/en-GB/services.lang.json
@@ -1,3 +1,4 @@
 {
-  "ErrorGettingServices": "Error getting service list"
+  "ErrorGettingServices": "Error getting service list",
+  "Services": "Services"
 }