Skip to content

Commit

Permalink
fix: translated index.html issue
Browse files Browse the repository at this point in the history
fix: a few basic fixes
  • Loading branch information
supermurat committed Dec 1, 2019
1 parent 0716b6e commit 468a24d
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 33 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Expand Up @@ -14,9 +14,8 @@ before_install:
- echo "TRAVIS_PULL_REQUEST_BRANCH:$TRAVIS_PULL_REQUEST_BRANCH"
- echo "TRAVIS_TAG:$TRAVIS_TAG"
- nvm install 10
- npm i -g firebase-tools@7.8.1 @angular/cli@8.3.19 selenium-webdriver @commitlint/travis-cli
install:
- npm i -g ncp del-cli @compodoc/compodoc
- npm i -g firebase-tools@7.8.1 @angular/cli@8.3.19 selenium-webdriver @commitlint/travis-cli ncp del-cli @compodoc/compodoc
- npm install
- cd functions && npm install && cd ..
before_script:
Expand Down
42 changes: 12 additions & 30 deletions angular.json
Expand Up @@ -41,12 +41,9 @@
{
"replace": "src/manifest.json",
"with": "src/environments/manifest.en.json"
},
{
"replace": "src/index.html",
"with": "src/environments/index.en.html"
}
]
],
"index": "src/environments/en/index.html"
},
"tr": {
"aot": true,
Expand All @@ -60,12 +57,9 @@
{
"replace": "src/manifest.json",
"with": "src/environments/manifest.tr.json"
},
{
"replace": "src/index.html",
"with": "src/environments/index.tr.html"
}
]
],
"index": "src/environments/tr/index.html"
},
"beta": {
"optimization": true,
Expand Down Expand Up @@ -103,10 +97,6 @@
{
"replace": "src/manifest.json",
"with": "src/environments/manifest.en.beta.json"
},
{
"replace": "src/index.html",
"with": "src/environments/index.en.beta.html"
}
],
"serviceWorker": true,
Expand All @@ -115,7 +105,8 @@
"i18nFile": "src/locale/messages.en.xlf",
"i18nFormat": "xlf",
"i18nLocale": "en-US",
"i18nMissingTranslation": "error"
"i18nMissingTranslation": "error",
"index": "src/environments/en/beta/index.html"
},
"beta-tr": {
"optimization": true,
Expand All @@ -135,10 +126,6 @@
{
"replace": "src/manifest.json",
"with": "src/environments/manifest.tr.beta.json"
},
{
"replace": "src/index.html",
"with": "src/environments/index.tr.beta.html"
}
],
"serviceWorker": true,
Expand All @@ -147,7 +134,8 @@
"i18nFile": "src/locale/messages.tr.xlf",
"i18nFormat": "xlf",
"i18nLocale": "tr-TR",
"i18nMissingTranslation": "error"
"i18nMissingTranslation": "error",
"index": "src/environments/tr/beta/index.html"
},
"production": {
"optimization": true,
Expand Down Expand Up @@ -185,10 +173,6 @@
{
"replace": "src/manifest.json",
"with": "src/environments/manifest.en.prod.json"
},
{
"replace": "src/index.html",
"with": "src/environments/index.en.prod.html"
}
],
"serviceWorker": true,
Expand All @@ -197,7 +181,8 @@
"i18nFile": "src/locale/messages.en.xlf",
"i18nFormat": "xlf",
"i18nLocale": "en-US",
"i18nMissingTranslation": "error"
"i18nMissingTranslation": "error",
"index": "src/environments/en/prod/index.html"
},
"production-tr": {
"optimization": true,
Expand All @@ -217,10 +202,6 @@
{
"replace": "src/manifest.json",
"with": "src/environments/manifest.tr.prod.json"
},
{
"replace": "src/index.html",
"with": "src/environments/index.tr.prod.html"
}
],
"serviceWorker": true,
Expand All @@ -229,7 +210,8 @@
"i18nFile": "src/locale/messages.tr.xlf",
"i18nFormat": "xlf",
"i18nLocale": "tr-TR",
"i18nMissingTranslation": "error"
"i18nMissingTranslation": "error",
"index": "src/environments/tr/prod/index.html"
}
}
},
Expand Down
1 change: 1 addition & 0 deletions functions/package.json
Expand Up @@ -66,6 +66,7 @@
"@types/jasmine": "~3.5.0",
"@types/node": "~12.12.12",
"firebase-functions-test": "^0.1.7",
"jasmine": "^3.5.0",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~4.2.1",
"jasmine-ts": "^0.3.0",
Expand Down
3 changes: 2 additions & 1 deletion karma.conf.ts
Expand Up @@ -19,7 +19,8 @@ module.exports = config => {
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, 'coverage'),
dir: require('path')
.join(__dirname, 'coverage'),
reports: ['html', 'lcovonly', 'text-summary', 'json-summary', 'json'],
fixWebpackSourcePaths: true
},
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 468a24d

Please sign in to comment.