feat(translateProvider): add storagePrefix() method

angular-translate · May 12, 2013 · 64cd99b · 64cd99b
1 parent 86410d9
commit 64cd99b
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 8 deletions.
diff --git a/ngTranslate/translate.js b/ngTranslate/translate.js
@@ -42,6 +42,7 @@ angular.module('ngTranslate').provider('$translate', ['$STORAGE_KEY', function (
       $uses,
       $storageFactory,
       $storageKey = $STORAGE_KEY,
+      $storagePrefix,
       $missingTranslationHandler,
       $asyncLoaders = [],
       NESTED_OBJECT_DELIMITER = '.';
@@ -280,14 +281,18 @@ angular.module('ngTranslate').provider('$translate', ['$STORAGE_KEY', function (
    * @param {string} key A key for the storage.
    *
    */
-  this.storageKey = function(key) {
-    if (angular.isString(key)) {
-      $storageKey = key;
-    } else {
+  var storageKey = function(key) {
+    if (!key) {
+      if ($storagePrefix) {
+        return $storagePrefix + $storageKey;
+      }
       return $storageKey;
     }
+    $storageKey = key;
   };
 
+  this.storageKey = storageKey;
+
  /**
    * @ngdoc function
    * @name ngTranslate.$translateProvider#missingTranslationHandler
@@ -481,6 +486,23 @@ angular.module('ngTranslate').provider('$translate', ['$STORAGE_KEY', function (
     $storageFactory = storageFactory;
   };
 
+  /**
+   * @ngdoc function
+   * @name ngTranslate.$translateProvider#storagePrefix
+   * @methodOf ngTranslate.$translateProvider
+   *
+   * @description
+   * Sets prefix for storage key.
+   *
+   * @param {string} prefix Storage key prefix
+   */
+  this.storagePrefix = function (prefix) {
+    if (!prefix) {
+      return prefix;
+    }
+    $storagePrefix = prefix;
+  };
+
   /**
    * @ngdoc function
    * @name ngTranslate.$translate
@@ -594,7 +616,7 @@ angular.module('ngTranslate').provider('$translate', ['$STORAGE_KEY', function (
           $uses = key;
 
           if ($storageFactory) {
-            Storage.set($storageKey, $uses);
+            Storage.set($translate.storageKey(), $uses);
           }
           $rootScope.$broadcast('translationChangeSuccess');
           deferred.resolve($uses);
@@ -608,8 +630,8 @@ angular.module('ngTranslate').provider('$translate', ['$STORAGE_KEY', function (
       $uses = key;
 
       if ($storageFactory) {
-        Storage.set($storageKey, $uses);
-        console.log(Storage.get($storageKey));
+        Storage.set($translate.storageKey(), $uses);
+        console.log(Storage.get($translate.storageKey()));
       }
 
       deferred.resolve($uses);
@@ -628,7 +650,7 @@ angular.module('ngTranslate').provider('$translate', ['$STORAGE_KEY', function (
      * @return {string} storage key
      */
     $translate.storageKey = function() {
-      return $storageKey;
+      return storageKey();
     };
 
     // If at least one async loader is defined and there are no (default) translations available

diff --git a/test/unit/translateServiceSpec.js b/test/unit/translateServiceSpec.js
@@ -666,5 +666,20 @@ describe('ngTranslate', function () {
         });
       });
     });
+
+    describe('storage prefix', function () {
+
+      beforeEach(module('ngTranslate', function ($translateProvider) {
+        $translateProvider.storagePrefix('test');
+        $translateProvider.useCookieStorage();
+        $translateProvider.preferredLanguage('de_DE');
+      }));
+
+      it('should use storage prefix', function () {
+        inject(function ($translate) {
+          expect($translate.storageKey()).toEqual('testNG_TRANSLATE_LANG_KEY');
+        });
+      });
+    });
   });
 });