Merge remote-tracking branch 'origin/master'

README.md

@@ -3,6 +3,8 @@ SwitchyOmega
 
 Manage and switch between multiple proxies quickly & easily.
 
+[![Translation status](https://hosted.weblate.org/widgets/switchyomega/-/svg-badge.svg)](https://hosted.weblate.org/engage/switchyomega/?utm_source=widget)
+
 Chromium Extension
 ------------------
 The project is available as a Chromium Extension.
@@ -62,15 +64,14 @@ time for that now. Feel free to open a pull request if you want to help.
 
 ## Translation
 
-All translations are in the `omega-i18n` folder. For now, only `en` \(English\)
-and `zh` \(简体中文\) translations are done. If you notice a translation issue
-such as typo or bad spelling, please open an issue or a pull request.
+Translation is hosted on Weblate. If you want to help improve the translated
+text or start translation for your language, please follow the link of the picture
+below.
 
-You can also help to translate SwitchyOmega into your language. Just fork the
-project and copy the `en` folder to a new folder named the locale code of your
-choice. Then edit the `message.json` to provide translations. The file is in
-[Chrome Extension Locale-Specific Messages Format](https://developer.chrome.com/extensions/i18n-messages).
-Don't forget to open a pull request when you are done translating.
+本项目翻译由Weblate托管。如果您希望帮助改进翻译，或将本项目翻译成一种新的语言，请
+点击下方图片链接进入翻译。
+
+[![Translation status](https://hosted.weblate.org/widgets/switchyomega/-/287x66-white.png)](https://hosted.weblate.org/engage/switchyomega/?utm_source=widget)
 
 ## Building the project
 

omega-build/package.json

@@ -7,7 +7,7 @@
     "grunt-hub": "^0.7.0"
   },
   "scripts": {
-    "deps": "npm install && (cd ../omega-pac && npm install); (cd ../omega-target && npm install); (cd ../omega-web && npm install && bower install); (cd ../omega-target-chromium-extension/ && npm install);",
-    "dev": "(cd ../omega-pac && npm run dev); (cd ../omega-target && npm run dev); (cd ../omega-web && npm run dev); (cd ../omega-target-chromium-extension/ && npm run dev);"
+    "deps": "npm install && (cd ../omega-pac && npm install) && (cd ../omega-target && npm install) && (cd ../omega-web && npm install && bower install) && (cd ../omega-target-chromium-extension/ && npm install)",
+    "dev": "(cd ../omega-pac && npm run dev) && (cd ../omega-target && npm run dev) && (cd ../omega-web && npm run dev) && (cd ../omega-target-chromium-extension/ && npm run dev)"
   }
 }

omega-target-chromium-extension/package.json

@@ -27,6 +27,6 @@
     "omega-target": "./omega_target_shim.js"
   },
   "scripts": {
-    "dev": "npm link omega-target; npm link omega-web"
+    "dev": "npm link omega-target && npm link omega-web"
   }
 }

omega-target/package.json

@@ -28,6 +28,6 @@
     "omega-pac": "./omega_pac_shim.js"
   },
   "scripts": {
-    "dev": "npm link omega-pac; npm link"
+    "dev": "npm link omega-pac && npm link"
   }
 }

omega-target/src/browser_storage.coffee

@@ -14,9 +14,10 @@ class BrowserStorage extends Storage
         map[key] = undefined
     else if typeof keys == 'object'
       map = keys
-    for own key, value of map
+    for own key of map
       try
-        map[key] = JSON.parse(@proto.getItem.call(@storage, @prefix + key))
+        value = JSON.parse(@proto.getItem.call(@storage, @prefix + key))
+      map[key] = value if value?
       if typeof map[key] == 'undefined'
         delete map[key]
     Promise.resolve map

omega-web/package.json

@@ -20,6 +20,6 @@
     "omega-pac": "../omega-pac"
   },
   "scripts": {
-    "dev": "npm link omega-pac; npm link"
+    "dev": "npm link omega-pac && npm link"
   }
 }