Skip to content

Commit

Permalink
fixup! test: update ivy i18n integration test
Browse files Browse the repository at this point in the history
  • Loading branch information
petebacondarwin committed Oct 24, 2019
1 parent 19ca362 commit 35fbd2c
Show file tree
Hide file tree
Showing 6 changed files with 105 additions and 6 deletions.
13 changes: 13 additions & 0 deletions integration/cli-hello-world-ivy-i18n/angular.json
Expand Up @@ -45,6 +45,10 @@
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
},
{
"replace": "src/polyfills.ts",
"with": "src/polyfills-runtime.ts"
}
],
"optimization": true,
Expand All @@ -69,6 +73,14 @@
}
]
},
"runtime-translations": {
"fileReplacements": [
{
"replace": "src/polyfills.ts",
"with": "src/polyfills-runtime.ts"
}
]
},
"translated-legacy": {
"tsConfig": "tsconfig.legacy.json",
"optimization": true,
Expand All @@ -93,6 +105,7 @@
"browserTarget": "cli-hello-world-ivy-i18n:build:production"
},
"ci": {
"browserTarget": "cli-hello-world-ivy-i18n:build:runtime-translations",
"progress": false
},
"ci-production": {
Expand Down
5 changes: 4 additions & 1 deletion integration/cli-hello-world-ivy-i18n/e2e/README.md
Expand Up @@ -5,7 +5,10 @@ translation scenarios, but they are all built with IVY enabled.

### runtime

Translations are provided at runtime by calling `loadTranslations()` in the polyfill.ts
A new `polyfills.ts` file is provided (`polyfills-runtime.ts`) which is swapped in by a file
replacement in the `angular.json` configuration. In this new file:
* Runtime translations are provided (`loadTranslations()`).
* The current locale is set (`$localize.locale = 'fr'`) and loaded (`registerLocaleData(localeFr);`)

### de and fr

Expand Down
Expand Up @@ -16,5 +16,5 @@ describe('cli-hello-world-ivy App', () => {
expect(page.getParagraph('message')).toEqual('Welcome to the i18n app.');
});

it('should display the locale', () => { expect(page.getParagraph('locale')).toEqual('fr'); });
it('should display the locale', () => { expect(page.getParagraph('locale')).toEqual('legacy'); });
});
2 changes: 1 addition & 1 deletion integration/cli-hello-world-ivy-i18n/package.json
Expand Up @@ -21,7 +21,7 @@
"translated:en:serve": "serve ../tmp/translations/en-US --listen 4200",
"translated:en:e2e": "npm-run-all -p -r translated:en:serve \"ng e2e --configuration=translated-en\"",
"translated:legacy:test": "yarn translated:legacy:extract-and-update && ng build --configuration=translated-legacy && yarn translated:legacy:translate && yarn translated:legacy:e2e",
"translated:legacy:extract-and-update": "ng xi18n && sed -i.bak -e 's/source>/target>'/ -e 's/Hello/Bonjour/' -e 's/source-language=\"en-US\"/source-language=\"en-US\" target-language=\"legacy\"/' ../tmp/legacy-locales/messages.legacy.xlf",
"translated:legacy:extract-and-update": "ng xi18n && sed -i.bak -e 's/source>/target>'/ -e 's/Hello/Bonjour/' -e 's/source-language=\"en\"/source-language=\"en\" target-language=\"legacy\"/' ../tmp/legacy-locales/messages.legacy.xlf",
"translated:legacy:translate": "localize-translate -r \"dist/\" -s \"**/*\" -t \"../tmp/legacy-locales/messages.legacy.xlf\" -o \"../tmp/translations/{{LOCALE}}\"",
"translated:legacy:serve": "serve ../tmp/translations/legacy --listen 4200",
"translated:legacy:e2e": "npm-run-all -p -r translated:legacy:serve \"ng e2e --configuration=translated-legacy\""
Expand Down
86 changes: 86 additions & 0 deletions integration/cli-hello-world-ivy-i18n/src/polyfills-runtime.ts
@@ -0,0 +1,86 @@
/**
* This file includes polyfills needed by Angular and is loaded before the app.
* You can add your own extra polyfills to this file.
*
* This file is divided into 2 sections:
* 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
* 2. Application imports. Files imported after ZoneJS that should be loaded before your main
* file.
*
* The current setup is for so-called "evergreen" browsers; the last versions of browsers that
* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
*
* Learn more in https://angular.io/guide/browser-support
*/

/***************************************************************************************************
* BROWSER POLYFILLS
*/

/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.

/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
*/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.

/**
* By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags
* because those flags need to be set before `zone.js` being loaded, and webpack
* will put import in the top of bundle, so user need to create a separate file
* in this directory (for example: zone-flags.ts), and put the following flags
* into that file, and then add the following code before importing zone.js.
* import './zone-flags.ts';
*
* The flags allowed in zone-flags.ts are listed here.
*
* The following flags will work for all browsers.
*
* (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch
* requestAnimationFrame
* (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
* (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch
* specified eventNames
*
* in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
* with the following flag, it will bypass `zone.js` patch for IE/Edge
*
* (window as any).__Zone_enable_cross_context_check = true;
*
*/

/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.

/***************************************************************************************************
* Load `$localize` onto the global scope - used if i18n tags appear in Angular templates.
*/
import '@angular/localize/init';

// Note that `computeMsgId` is a private API at this stage. It will probably be exported directly
// from `@angular/localize` at some point.
import {computeMsgId} from '@angular/compiler';
import {loadTranslations} from '@angular/localize';

// Load some runtime translations!
loadTranslations({
[computeMsgId(' Hello {$INTERPOLATION}! ')]: 'Bonjour {$INTERPOLATION}!',
[computeMsgId('Welcome to the i18n app.')]: 'Bienvenue sur l\'application i18n.',
});

// Set up the locale for the runtime inlining (EXPERIMENTAL)
$localize.locale = 'fr';
import {registerLocaleData} from '@angular/common';
import localeFr from '@angular/common/locales/fr';
registerLocaleData(localeFr);

/***************************************************************************************************
* APPLICATION IMPORTS
*/
3 changes: 0 additions & 3 deletions integration/cli-hello-world-ivy-i18n/src/polyfills.ts
Expand Up @@ -73,9 +73,6 @@ loadTranslations({
[computeMsgId('Welcome to the i18n app.')]: 'Bienvenue sur l\'application i18n.',
});

// Set the locale for the runtime inlining (EXPERIMENTAL)
$localize.locale = 'fr';

/***************************************************************************************************
* APPLICATION IMPORTS
*/

0 comments on commit 35fbd2c

Please sign in to comment.