Merge branch 'canary'

Author: knalli

.travis.yml

@@ -28,3 +28,4 @@ env:
   - TEST_SCOPE=angular_1.5.x
   - TEST_SCOPE=angular_1.6.x
   - TEST_SCOPE=angular_1.7.x
+  - TEST_SCOPE=angular_1.8.x

bower.json

@@ -2,7 +2,7 @@
   "author": "Pascal Precht",
   "name": "angular-translate",
   "description": "A translation module for AngularJS",
-  "version": "2.18.2",
+  "version": "2.18.3",
   "homepage": "http://github.com/angular-translate/angular-translate",
   "ignore": [],
   "repository": {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-translate",
-  "version": "2.18.2",
+  "version": "2.18.3",
   "description": "A translation module for AngularJS",
   "main": "dist/angular-translate.js",
   "repository": {
@@ -102,6 +102,6 @@
     "tar": "^4.4.13"
   },
   "dependencies": {
-    "angular": "^1.7.9"
+    "angular": "^1.8.0"
   }
 }

package.json

@@ -478,13 +478,24 @@ describe('pascalprecht.translate', function () {
       expect(element.children().text()).toEqual('hello my name is Pascal');
     });
 
-    it('should not translate the content if the content is empty and an attribute is being translated', function () {
-      var markup = '<a href="#" translate translate-attr-title="SIMPLE">\n\t<i class="fa fa-home" />\n</a>';
-      element = $compile(markup)($rootScope);
-      $rootScope.$digest();
-      expect(element.attr('title')).toEqual('Hello');
-      expect(element.html().trim()).toEqual('<i class="fa fa-home"></i>');
-    });
+
+    if (angular.version.major === 1 && angular.version.minor <= 7) {
+      it('should not translate the content if the content is empty and an attribute is being translated', function () {
+        var markup = '<a href="#" translate translate-attr-title="SIMPLE">\n\t<i class="fa fa-home" />\n</a>';
+        element = $compile(markup)($rootScope);
+        $rootScope.$digest();
+        expect(element.attr('title')).toEqual('Hello');
+        expect(element.html().trim()).toEqual('<i class="fa fa-home"></i>');
+      });
+    } else {
+      it('should not translate the content if the content is empty and an attribute is being translated', function () {
+        var markup = '<a href="#" translate translate-attr-title="SIMPLE">\n\t<i class="fa fa-home" />\n</a>';
+        element = $compile(markup)($rootScope);
+        $rootScope.$digest();
+        expect(element.attr('title')).toEqual('Hello');
+        expect(element.html().trim()).toEqual('<i class="fa fa-home">\n</i>');
+      });
+    }
 
     it('should translate the content and the attribute if the element content is non empty text and the element has translated attributes', function () {
       var markup = '<a href="#" translate translate-attr-title="SIMPLE">SIMPLE</a>';

test/unit/directive/translate.spec.js

@@ -0,0 +1,26 @@
+{
+  "author": "Pascal Precht",
+  "name": "angular-translate",
+  "description": "A translation module for AngularJS",
+  "version": "0.0.0",
+  "homepage": "http://github.com/angular-translate/angular-translate",
+  "ignore": [],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/angular-translate/angular-translate"
+  },
+  "devDependencies": {
+    "angular": "~1.8.0",
+    "angular-mocks": "~1.8.0",
+    "angular-cookies": "~1.8.0",
+    "angular-sanitize": "~1.8.0",
+    "messageformat": "~1.0.2"
+  },
+  "resolutions": {
+    "angular": "~1.8.0"
+  },
+  "licenses": [{
+    "type": "MIT",
+    "url": "http://www.opensource.org/licenses/MIT"
+  }]
+}