Merge branch 'master' of github.com:Haixing-Hu/vue-select

README.md

@@ -24,7 +24,7 @@ The demo page is [HERE](http://haixing-hu.github.io/vue-select/demo.html).
 ## npm
 
 ```shell
-$ npm install vue-select
+$ npm install vue-select2
 ```
 
 ## bower
@@ -182,7 +182,7 @@ The optional flag indicates whether to show the search box.
 ## `language`
 
 The optional code of language used by the
-[select2](https://github.com/select2/select2) plugin. Default value is `"en"`.
+[select2](https://github.com/select2/select2) plugin.
 
 The supported languages are exactly the same as the supported languages of the
 [select2](https://github.com/select2/select2) plugin. In order to use the
@@ -197,6 +197,11 @@ have different variants in different country or region, e.g., `"zh-CN"` for the
 simplified Chinese and `"zh-TW"` for the traditional Chinese, it's recommended
 to use the locale code in the form of `"[language]-[country]"`.
 
+If this property is not set, and the [vue-i18n](https://github.com/Haixing-Hu/vue-i18n)
+plugin is used, the component will use the language code `$language` provided
+by the [vue-i18n](https://github.com/Haixing-Hu/vue-i18n) plugin; otherwise, the
+component will use the default value `"en-US"`.
+
 ## `theme`
 
 The optional name of the theme of the [select2](https://github.com/select2/select2)

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "vue-select",
   "description": "A Vue.js component implementing the select control with the jQuery select2 plugin.",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "keywords": [
     "Vue.js",
     "component",
@@ -31,5 +31,8 @@
     "bootstrap": "^3.3.5",
     "select2": "^4.0.0",
     "select2-bootstrap-theme": "^0.1.0-beta.4"
+  },
+  "devDependencies": {
+    "vue-i18n-plugin": ">=0.1.3"
   }
 }