Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

I18n changes #12362

Merged
merged 4 commits into from
Jul 16, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ module.exports = function(grunt) {
},
angular: {
dest: 'build/angular.js',
src: util.wrap([files['angularSrc']], 'angular'),
src: util.wrap([files['angularSrc']], 'angular')
.concat('src/ngLocale/angular-locale_en-us.js'),
styles: {
css: ['css/angular.css'],
generateCspCssFile: true,
Expand Down
16 changes: 10 additions & 6 deletions angularFiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ var angularFiles = {
'src/ng/httpBackend.js',
'src/ng/interpolate.js',
'src/ng/interval.js',
'src/ng/locale.js',
'src/ng/location.js',
'src/ng/log.js',
'src/ng/parse.js',
Expand Down Expand Up @@ -182,7 +181,8 @@ var angularFiles = {
'src/publishExternalApis.js',
'@angularSrcModules',
'@angularScenario',
'@angularTest'
'@angularTest',
'src/ngLocale/angular-locale_en-us.js' // we need an ngLocale module
],

'karmaExclude': [
Expand All @@ -193,12 +193,13 @@ var angularFiles = {

'karmaScenario': [
'build/angular-scenario.js',
'build/docs/docs-scenario.js'
'build/docs/docs-scenario.js',
'src/ngLocale/angular-locale_en-us.js' // we need an ngLocale module
],

"karmaModules": [
'build/angular.js',
'@angularSrcModules',
'@angularSrcModules',,
'src/ngScenario/browserTrigger.js',
'test/helpers/*.js',
'test/ngMessageFormat/*.js',
Expand All @@ -208,7 +209,8 @@ var angularFiles = {
'test/ngResource/*.js',
'test/ngSanitize/**/*.js',
'test/ngTouch/**/*.js',
'test/ngAria/*.js'
'test/ngAria/*.js',
'src/ngLocale/angular-locale_en-us.js' // we need an ngLocale module
],

'karmaJquery': [
Expand All @@ -218,7 +220,9 @@ var angularFiles = {
'src/publishExternalApis.js',
'@angularSrcModules',
'@angularScenario',
'@angularTest'
'@angularTest',
'src/ngLocale/angular-locale_en-us.js' // we need an ngLocale module

],

'karmaJqueryExclude': [
Expand Down
6 changes: 3 additions & 3 deletions docs/content/guide/i18n.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ directive}. Additionally, you can use {@link guide/i18n#messageformat-extension
`$interpolate` for localizable pluralization and gender support in all interpolations via the
`ngMessageFormat` module.

All localizable Angular components depend on locale-specific rule sets managed by the {@link
ng.$locale `$locale` service}.
All localizable Angular components depend on locale-specific rule sets managed by the
{@link ngLocale `$locale` service}.

There a few examples that showcase how to use Angular filters with various locale rule sets in the
[`i18n/e2e` directory](https://github.com/angular/angular.js/tree/master/i18n/e2e) of the Angular
Expand Down Expand Up @@ -99,7 +99,7 @@ develop your app.
### Currency symbol

Angular's {@link ng.filter:currency currency filter} allows you to use the default currency symbol
from the {@link ng.$locale locale service}, or you can provide the filter with a custom currency
from the {@link ngLocale `locale` service}, or you can provide the filter with a custom currency
symbol.

<div class="alert alert-success">
Expand Down
7 changes: 5 additions & 2 deletions i18n/closure/currencySymbols.js
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,8 @@ goog.i18n.currency.CurrencyInfo = {
'KRW': [0, '\u20A9', 'KR₩'],
'LKR': [2, 'Rs', 'SLRs'],
'LTL': [2, 'Lt', 'Lt'],
'LVL': [2, 'Ls', 'Ls'],
'MNT': [0, '\u20AE', 'MN₮'],
'MVR': [2, 'Rf', 'MVR'],
'MXN': [2, '$', 'Mex$'],
'MYR': [2, 'RM', 'RM'],
'NOK': [50, 'kr', 'NOkr'],
Expand Down Expand Up @@ -339,6 +339,7 @@ goog.i18n.currency.CurrencyInfo = {
goog.i18n.currency.CurrencyInfoTier2 = {
'AFN': [48, 'Af.', 'AFN'],
'AMD': [0, 'Dram', 'dram'],
'ANG': [2, 'NAf.', 'ANG'],
'AOA': [2, 'Kz', 'Kz'],
'ARS': [2, '$', 'AR$'],
'AWG': [2, 'Afl.', 'Afl.'],
Expand Down Expand Up @@ -414,6 +415,7 @@ goog.i18n.currency.CurrencyInfoTier2 = {
'SLL': [0, 'SLL', 'SLL'],
'SOS': [0, 'SOS', 'SOS'],
'SRD': [2, '$', 'SR$'],
'SSP': [2, '£', 'SSP'],
'STD': [0, 'Db', 'Db'],
'SYP': [0, '£', 'SY£'],
'SZL': [2, 'SZL', 'SZL'],
Expand All @@ -430,5 +432,6 @@ goog.i18n.currency.CurrencyInfoTier2 = {
'XCD': [2, '$', 'EC$'],
'XOF': [0, 'CFA', 'CFA'],
'XPF': [0, 'FCFP', 'FCFP'],
'ZMK': [0, 'ZMK', 'ZMK']
'ZMW': [0, 'ZMW', 'ZMW'],
'ZWD': [0, '$', 'Z$']
};
Loading