@abp/core 6.0.1 → 7.0.0-rc.2

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.0.1",
+  "version": "7.0.0-rc.2",
   "name": "@abp/core",
   "repository": {
     "type": "git",
@@ -10,7 +10,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@abp/utils": "~6.0.1"
+    "@abp/utils": "~7.0.0-rc.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }

package/src/abp.js

@@ -72,59 +72,90 @@ var abp = abp || {};
     /* LOCALIZATION ***********************************************/
 
     abp.localization = abp.localization || {};
-
+    abp.localization.internal = abp.localization.internal || {};
     abp.localization.values =  abp.localization.values || {};
-
-    abp.localization.localize = function (key, sourceName) {
-        if (sourceName === '_') { //A convention to suppress the localization
-            return key;
+    abp.localization.resources =  abp.localization.resources || {};
+
+    abp.localization.internal.getResource = function (resourceName) {
+        var resource = abp.localization.resources[resourceName];
+        if (resource) {
+            return resource;
+        }
+        
+        var legacySource = abp.localization.values[resourceName];
+        if (legacySource) {
+            return {
+                texts: abp.localization.values[resourceName],
+                baseResources: []
+            };
         }
-
-        sourceName = sourceName || abp.localization.defaultResourceName;
-        if (!sourceName) {
-            abp.log.warn('Localization source name is not specified and the defaultResourceName was not defined!');
-            return key;
+        
+        abp.log.warn('Could not find localization source: ' + resourceName);        
+        return null;
+    };
+    
+    abp.localization.internal.localize = function (key, sourceName) {
+        var resource = abp.localization.internal.getResource(sourceName);
+        if (!resource){
+            return {
+                value: key,
+                found: false
+            };
         }
 
-        var source = abp.localization.values[sourceName];
-        if (!source) {
-            abp.log.warn('Could not find localization source: ' + sourceName);
-            return key;
-        }
+        var value = resource.texts[key];
+        if (value === undefined) {            
+            for (var i = 0; i < resource.baseResources.length; i++){
+                var basedArguments = Array.prototype.slice.call(arguments, 0);
+                basedArguments[1] = resource.baseResources[i];
 
-        var value = source[key];
-        if (value == undefined) {
-            return key;
+                var result = abp.localization.internal.localize.apply(this, basedArguments);
+                if (result.found){
+                    return result;
+                }
+            }
+            
+            return {
+                value: key,
+                found: false
+            };
         }
 
         var copiedArguments = Array.prototype.slice.call(arguments, 0);
         copiedArguments.splice(1, 1);
         copiedArguments[0] = value;
 
-        return abp.utils.formatString.apply(this, copiedArguments);
+        return {
+            value: abp.utils.formatString.apply(this, copiedArguments),
+            found: true
+        };
     };
 
-    abp.localization.isLocalized = function (key, sourceName) {
+    abp.localization.localize = function (key, sourceName) {
         if (sourceName === '_') { //A convention to suppress the localization
-            return true;
+            return key;
         }
 
         sourceName = sourceName || abp.localization.defaultResourceName;
         if (!sourceName) {
-            return false;
+            abp.log.warn('Localization source name is not specified and the defaultResourceName was not defined!');
+            return key;
         }
 
-        var source = abp.localization.values[sourceName];
-        if (!source) {
-            return false;
+        return abp.localization.internal.localize.apply(this, arguments).value;
+    };
+
+    abp.localization.isLocalized = function (key, sourceName) {
+        if (sourceName === '_') { //A convention to suppress the localization
+            return true;
         }
 
-        var value = source[key];
-        if (value === undefined) {
+        sourceName = sourceName || abp.localization.defaultResourceName;
+        if (!sourceName) {
             return false;
         }
 
-        return true;
+        return abp.localization.internal.localize(key, sourceName).found;
     };
 
     abp.localization.getResource = function (name) {
@@ -173,12 +204,10 @@ var abp = abp || {};
 
     abp.auth = abp.auth || {};
 
-    abp.auth.policies = abp.auth.policies || {};
-
     abp.auth.grantedPolicies = abp.auth.grantedPolicies || {};
 
     abp.auth.isGranted = function (policyName) {
-        return abp.auth.policies[policyName] != undefined && abp.auth.grantedPolicies[policyName] != undefined;
+        return abp.auth.grantedPolicies[policyName] != undefined;
     };
 
     abp.auth.isAnyGranted = function () {
@@ -687,7 +716,7 @@ var abp = abp || {};
     }
 
     /**
-     * Escape HTML to help prevent XSS attacks. 
+     * Escape HTML to help prevent XSS attacks.
      */
     abp.utils.htmlEscape = function (html) {
         return typeof html === 'string' ? html.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;') : html;
@@ -759,7 +788,7 @@ var abp = abp || {};
             return toUtc(date);
         }
     };
-    
+
     /* FEATURES *************************************************/
 
     abp.features = abp.features || {};
@@ -774,7 +803,7 @@ var abp = abp || {};
     abp.features.get = function (name) {
         return abp.features.values[name];
     };
-    
+
     /* GLOBAL FEATURES *************************************************/
 
     abp.globalFeatures = abp.globalFeatures || {};