diff --git a/README.md b/README.md index 9d3ab0a..35c26a7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Ember-i18n-iso-countries [![npm version](https://badge.fury.io/js/ember-countries.svg)](https://badge.fury.io/js/ember-i18n-iso-countries) [![Ember Observer Score](http://emberobserver.com/badges/ember-countries.svg)](http://emberobserver.com/addons/ember-i18n-iso-countries) + Ember.js Addon Wrapper for the [i18n-iso-countries](https://github.com/michaelwittig/node-i18n-iso-countries). i18n for ISO 3166-1 country codes. We support Alpha-2, Alpha-3 and Numeric codes from http://en.wikipedia.org/wiki/ISO_3166-1#Officially_assigned_code_elements diff --git a/addon/index.js b/addon/index.js index b6b5d8f..223d672 100644 --- a/addon/index.js +++ b/addon/index.js @@ -140,7 +140,7 @@ export function getName(code, lang) { } catch (err) { return undefined; } -}; +} /* * @param lang language for country name @@ -148,7 +148,7 @@ export function getName(code, lang) { */ export function getNames(lang) { return langs[lang.toLowerCase()] || {}; -}; +} /* * @param name name @@ -170,25 +170,25 @@ export function getAlpha2Code(name, lang) { } catch (err) { return undefined; } -}; +} /* * @return hash (alpha-2 => alpha-3) */ export function getAlpha2Codes() { return alpha2; -}; +} /* * @return hash (alpha-3 => alpha-2) */ export function getAlpha3Codes() { return alpha3; -}; +} /* * @return hash (numeric => alpha-2) */ export function getNumericCodes() { return numeric; -}; \ No newline at end of file +} \ No newline at end of file diff --git a/addon/langs/fi.js b/addon/langs/fi.js index a8489f1..cc56480 100644 --- a/addon/langs/fi.js +++ b/addon/langs/fi.js @@ -258,4 +258,4 @@ export default { "VI": "Yhdysvaltain Neitsytsaaret", "UM": "Yhdysvaltain pienet erillissaaret", "ZW": "Zimbabwe" -} \ No newline at end of file +}; \ No newline at end of file diff --git a/addon/langs/fr.js b/addon/langs/fr.js index f1ab4e5..1469533 100644 --- a/addon/langs/fr.js +++ b/addon/langs/fr.js @@ -248,4 +248,4 @@ export default { "RS": "Serbie", "SX": "Saint-Martin (partie néerlandaise)", "SS": "Sud-Soudan" -} \ No newline at end of file +}; \ No newline at end of file diff --git a/addon/langs/nl.js b/addon/langs/nl.js index 410bd65..f4c3629 100644 --- a/addon/langs/nl.js +++ b/addon/langs/nl.js @@ -248,4 +248,4 @@ export default { "RS": "Servië", "SX": "Sint Maarten (Nederlands deel)", "SS": "Zuid-Soedan" -} \ No newline at end of file +}; \ No newline at end of file diff --git a/addon/langs/pt.js b/addon/langs/pt.js index 6409310..c91798c 100644 --- a/addon/langs/pt.js +++ b/addon/langs/pt.js @@ -254,4 +254,4 @@ export default { "WF": "Wallis e Futuna", "ZM": "Zâmbia", "ZW": "Zimbábue" -} \ No newline at end of file +}; \ No newline at end of file diff --git a/addon/langs/sv.js b/addon/langs/sv.js index 36d452e..aa4e775 100644 --- a/addon/langs/sv.js +++ b/addon/langs/sv.js @@ -251,4 +251,4 @@ export default { "ZA": "Sydafrika", "ZM": "Zambia", "ZW": "Zimbabwe" -} \ No newline at end of file +}; \ No newline at end of file diff --git a/bower.json b/bower.json index dd0b655..ee53afb 100644 --- a/bower.json +++ b/bower.json @@ -1,8 +1,8 @@ { "name": "ember-i18n-iso-countries", "dependencies": { - "ember": "~2.3.1", - "ember-cli-shims": "0.1.0", + "ember": "~2.5.0", + "ember-cli-shims": "0.1.1", "ember-cli-test-loader": "0.2.2", "ember-qunit-notifications": "0.1.0" } diff --git a/config/ember-try.js b/config/ember-try.js index be846e1..014f603 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -7,6 +7,17 @@ module.exports = { dependencies: { } } }, + { + name: 'ember-1.13', + bower: { + dependencies: { + 'ember': '~1.13.0' + }, + resolutions: { + 'ember': '~1.13.0' + } + } + }, { name: 'ember-release', bower: { diff --git a/package.json b/package.json index 1a10810..f642eae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-i18n-iso-countries", - "version": "1.0.0", + "version": "1.1.0", "description": "Ember i18n for ISO 3166-1 country codes, support Alpha-2, Alpha-3 and Numeric codes", "directories": { "doc": "doc", @@ -21,32 +21,30 @@ "author": "", "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.2.0", + "broccoli-asset-rev": "^2.4.2", "ember-ajax": "0.7.1", - "ember-cli": "2.3.0", + "ember-cli": "2.4.3", "ember-cli-app-version": "^1.0.0", "ember-cli-dependency-checker": "^1.2.0", - "ember-cli-htmlbars": "^1.0.1", + "ember-cli-htmlbars": "^1.0.3", "ember-cli-htmlbars-inline-precompile": "^0.3.1", - "ember-cli-inject-live-reload": "^1.3.1", - "ember-cli-qunit": "^1.2.1", + "ember-cli-inject-live-reload": "^1.4.0", + "ember-cli-qunit": "^1.4.0", "ember-cli-release": "0.2.8", - "ember-cli-sri": "^2.0.0", + "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "^2.3.0", "ember-disable-prototype-extensions": "^1.1.0", - "ember-disable-proxy-controllers": "^1.0.1", - "ember-export-application-global": "^1.0.4", - "ember-load-initializers": "^0.5.0", + "ember-export-application-global": "^1.0.5", + "ember-load-initializers": "^0.5.1", "ember-resolver": "^2.0.3", - "ember-try": "^0.1.2", - "loader.js": "^4.0.0" + "ember-try": "^0.2.2", + "loader.js": "^4.0.1" }, "keywords": [ "ember-addon" ], "dependencies": { - "ember-cli-babel": "^5.1.5" + "ember-cli-babel": "^5.1.6" }, "ember-addon": { "configPath": "tests/dummy/config" diff --git a/testem.json b/testem.js similarity index 81% rename from testem.json rename to testem.js index 0f35392..26044b2 100644 --- a/testem.json +++ b/testem.js @@ -1,4 +1,5 @@ -{ +/*jshint node:true*/ +module.exports = { "framework": "qunit", "test_page": "tests/index.html?hidepassed", "disable_watching": true, @@ -9,4 +10,4 @@ "PhantomJS", "Chrome" ] -} +}; diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js index ed23003..8c8b74e 100644 --- a/tests/helpers/module-for-acceptance.js +++ b/tests/helpers/module-for-acceptance.js @@ -13,11 +13,11 @@ export default function(name, options = {}) { }, afterEach() { - destroyApp(this.application); - if (options.afterEach) { options.afterEach.apply(this, arguments); } + + destroyApp(this.application); } }); }