Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
AmilKey committed Apr 15, 2016
1 parent 5d5030e commit 6125337
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 31 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions addon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,15 @@ export function getName(code, lang) {
} catch (err) {
return undefined;
}
};
}

/*
* @param lang language for country name
* @return hash
*/
export function getNames(lang) {
return langs[lang.toLowerCase()] || {};
};
}

/*
* @param name name
Expand All @@ -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;
};
}
2 changes: 1 addition & 1 deletion addon/langs/fi.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,4 @@ export default {
"VI": "Yhdysvaltain Neitsytsaaret",
"UM": "Yhdysvaltain pienet erillissaaret",
"ZW": "Zimbabwe"
}
};
2 changes: 1 addition & 1 deletion addon/langs/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -248,4 +248,4 @@ export default {
"RS": "Serbie",
"SX": "Saint-Martin (partie néerlandaise)",
"SS": "Sud-Soudan"
}
};
2 changes: 1 addition & 1 deletion addon/langs/nl.js
Original file line number Diff line number Diff line change
Expand Up @@ -248,4 +248,4 @@ export default {
"RS": "Servië",
"SX": "Sint Maarten (Nederlands deel)",
"SS": "Zuid-Soedan"
}
};
2 changes: 1 addition & 1 deletion addon/langs/pt.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,4 +254,4 @@ export default {
"WF": "Wallis e Futuna",
"ZM": "Zâmbia",
"ZW": "Zimbábue"
}
};
2 changes: 1 addition & 1 deletion addon/langs/sv.js
Original file line number Diff line number Diff line change
Expand Up @@ -251,4 +251,4 @@ export default {
"ZA": "Sydafrika",
"ZM": "Zambia",
"ZW": "Zimbabwe"
}
};
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down
11 changes: 11 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
26 changes: 12 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions testem.json → testem.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
/*jshint node:true*/
module.exports = {
"framework": "qunit",
"test_page": "tests/index.html?hidepassed",
"disable_watching": true,
Expand All @@ -9,4 +10,4 @@
"PhantomJS",
"Chrome"
]
}
};
4 changes: 2 additions & 2 deletions tests/helpers/module-for-acceptance.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ export default function(name, options = {}) {
},

afterEach() {
destroyApp(this.application);

if (options.afterEach) {
options.afterEach.apply(this, arguments);
}

destroyApp(this.application);
}
});
}

0 comments on commit 6125337

Please sign in to comment.