From 0d64f08005d235ad76208000e34517591b6192e5 Mon Sep 17 00:00:00 2001 From: Chirayu Krishnappa Date: Tue, 14 Apr 2015 18:10:13 -0700 Subject: [PATCH] chore(ngMessageFormat): rename angular-messageFormat to angular-message-format Closes #11595 Closes #11597 --- Gruntfile.js | 4 ++-- docs/content/error/$interpolate/logicbug.ngdoc | 2 +- docs/content/error/$interpolate/nochgmustache.ngdoc | 2 +- docs/content/guide/i18n.ngdoc | 4 ++-- lib/grunt/utils.js | 2 +- src/ngMessageFormat/messageFormatService.js | 5 +++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 1e77eba3d8f3..b4c111e22d22 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -204,7 +204,7 @@ module.exports = function(grunt) { src: util.wrap(files['angularModules']['ngResource'], 'module') }, messageformat: { - dest: 'build/angular-messageFormat.js', + dest: 'build/angular-message-format.js', src: util.wrap(files['angularModules']['ngMessageFormat'], 'module') }, messages: { @@ -239,7 +239,7 @@ module.exports = function(grunt) { animate: 'build/angular-animate.js', cookies: 'build/angular-cookies.js', loader: 'build/angular-loader.js', - messageformat: 'build/angular-messageFormat.js', + messageformat: 'build/angular-message-format.js', messages: 'build/angular-messages.js', touch: 'build/angular-touch.js', resource: 'build/angular-resource.js', diff --git a/docs/content/error/$interpolate/logicbug.ngdoc b/docs/content/error/$interpolate/logicbug.ngdoc index c06d36468911..c660d8d39706 100644 --- a/docs/content/error/$interpolate/logicbug.ngdoc +++ b/docs/content/error/$interpolate/logicbug.ngdoc @@ -3,7 +3,7 @@ @fullName Bug in ngMessageFormat module @description -You've just hit a bug in the ngMessageFormat module provided by angular-messageFormat.min.js. +You've just hit a bug in the ngMessageFormat module provided by angular-message-format.min.js. Please file a github issue for this and provide the interpolation text that caused you to hit this bug mentioning the exact version of AngularJS used and we will fix it! diff --git a/docs/content/error/$interpolate/nochgmustache.ngdoc b/docs/content/error/$interpolate/nochgmustache.ngdoc index df590dca92aa..01652dafef02 100644 --- a/docs/content/error/$interpolate/nochgmustache.ngdoc +++ b/docs/content/error/$interpolate/nochgmustache.ngdoc @@ -4,7 +4,7 @@ @description You have redefined `$interpolate.startSymbol`/`$interpolate.endSymbol` and also -loaded the `ngMessageFormat` module (provided by angular-messageFormat.min.js) +loaded the `ngMessageFormat` module (provided by angular-message-format.min.js) while creating your injector. `ngMessageFormat` currently does not support redefinition of the diff --git a/docs/content/guide/i18n.ngdoc b/docs/content/guide/i18n.ngdoc index 9bd2673e7580..b87e594cb31c 100644 --- a/docs/content/guide/i18n.ngdoc +++ b/docs/content/guide/i18n.ngdoc @@ -154,8 +154,8 @@ You can read more about the ICU MessageFormat syntax at This extended syntax is provided by way of the `ngMessageFormat` module that your application can depend -upon (shipped separately as `angular-messageFormat.min.js` and -`angular-messageFormat.js`.) A current limitation of the +upon (shipped separately as `angular-message-format.min.js` and +`angular-message-format.js`.) A current limitation of the `ngMessageFormat` module, is that it does not support redefining the `$interpolate` start and end symbols. Only the default `{{` and `}}` are allowed. diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js index 80c97750a284..71fc5441fd80 100644 --- a/lib/grunt/utils.js +++ b/lib/grunt/utils.js @@ -185,7 +185,7 @@ module.exports = { var mapFileName = mapFile.match(/[^\/]+$/)[0]; var errorFileName = file.replace(/\.js$/, '-errors.json'); var versionNumber = grunt.config('NG_VERSION').full; - var compilationLevel = (file === 'build/angular-messageFormat.js') ? + var compilationLevel = (file === 'build/angular-message-format.js') ? 'ADVANCED_OPTIMIZATIONS' : 'SIMPLE_OPTIMIZATIONS'; shell.exec( 'java ' + diff --git a/src/ngMessageFormat/messageFormatService.js b/src/ngMessageFormat/messageFormatService.js index 75148be123f3..6f3abfc0f892 100644 --- a/src/ngMessageFormat/messageFormatService.js +++ b/src/ngMessageFormat/messageFormatService.js @@ -20,7 +20,7 @@ * * ## Example * - * + * * *
*
@@ -99,7 +99,7 @@ var $$MessageFormatFactory = ['$parse', '$locale', '$sce', '$exceptionHandler', var $$interpolateDecorator = ['$$messageFormat', '$delegate', function $$interpolateDecorator($$messageFormat, $interpolate) { if ($interpolate['startSymbol']() != "{{" || $interpolate['endSymbol']() != "}}") { - throw $interpolateMinErr('nochgmustache', 'angular-messageformat.js currently does not allow you to use custom start and end symbols for interpolation.'); + throw $interpolateMinErr('nochgmustache', 'angular-message-format.js currently does not allow you to use custom start and end symbols for interpolation.'); } var interpolate = $$messageFormat['interpolate']; interpolate['startSymbol'] = $interpolate['startSymbol']; @@ -111,6 +111,7 @@ var $$interpolateDecorator = ['$$messageFormat', '$delegate', function $$interpo /** * @ngdoc module * @name ngMessageFormat + * @packageName angular-message-format * @description */ var module = window['angular']['module']('ngMessageFormat', ['ng']);