From 52d92f8a9def3c70fb3f8f4b329b8f5095adba57 Mon Sep 17 00:00:00 2001
From: "Patrik J. Braun" <bra.patrik@gmail.com>
Date: Tue, 8 Jan 2019 10:52:39 +0100
Subject: [PATCH] fixing translation bug
---
frontend/app/app.module.ts | 13 +++----------
.../navigator/navigator.gallery.component.ts | 1 -
frontend/translate/messages.en.xlf | 4 ----
frontend/translate/messages.hu.xlf | 6 +-----
package.json | 2 +-
5 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/frontend/app/app.module.ts b/frontend/app/app.module.ts
index 1aca96969..45694f806 100644
--- a/frontend/app/app.module.ts
+++ b/frontend/app/app.module.ts
@@ -3,8 +3,7 @@ import {
LOCALE_ID,
NgModule,
TRANSLATIONS,
- TRANSLATIONS_FORMAT,
- MissingTranslationStrategy
+ TRANSLATIONS_FORMAT
} from '@angular/core';
import {BrowserModule, HAMMER_GESTURE_CONFIG, HammerGestureConfig} from '@angular/platform-browser';
import {FormsModule} from '@angular/forms';
@@ -63,7 +62,7 @@ import {HttpClientModule} from '@angular/common/http';
import {DefaultUrlSerializer, UrlSerializer, UrlTree} from '@angular/router';
import {IndexingSettingsComponent} from './settings/indexing/indexing.settings.component';
import {LanguageComponent} from './language/language.component';
-import {I18n, MISSING_TRANSLATION_STRATEGY} from '@ngx-translate/i18n-polyfill';
+import {I18n} from '@ngx-translate/i18n-polyfill';
import {QueryService} from './model/query.service';
import {IconizeSortingMethod} from './pipes/IconizeSortingMethod';
import {StringifySortingMethod} from './pipes/StringifySortingMethod';
@@ -89,7 +88,6 @@ export class MyHammerConfig extends HammerGestureConfig {
}
-
export class CustomUrlSerializer implements UrlSerializer {
private _defaultUrlSerializer: DefaultUrlSerializer = new DefaultUrlSerializer();
@@ -197,13 +195,8 @@ export function translationsFactory(locale: string) {
useFactory: translationsFactory,
deps: [LOCALE_ID]
},
- I18n,
-
- {provide: TRANSLATIONS, useValue: translationsFactory('en')},
{provide: TRANSLATIONS_FORMAT, useValue: 'xlf'},
- {provide: LOCALE_ID, useValue: 'en'},
- {provide: MISSING_TRANSLATION_STRATEGY, useValue: MissingTranslationStrategy.Ignore},
-
+ I18n
],
bootstrap: [AppComponent]
})
diff --git a/frontend/app/gallery/navigator/navigator.gallery.component.ts b/frontend/app/gallery/navigator/navigator.gallery.component.ts
index 6fec6cb09..93e3f64b6 100644
--- a/frontend/app/gallery/navigator/navigator.gallery.component.ts
+++ b/frontend/app/gallery/navigator/navigator.gallery.component.ts
@@ -11,7 +11,6 @@ import {SortingMethods} from '../../../../common/entities/SortingMethods';
import {Config} from '../../../../common/config/public/Config';
import {SearchResultDTO} from '../../../../common/entities/SearchResultDTO';
import {SearchTypes} from '../../../../common/entities/AutoCompleteItem';
-import {LightboxStates} from '../lightbox/lightbox.gallery.component';
@Component({
selector: 'app-gallery-navbar',
diff --git a/frontend/translate/messages.en.xlf b/frontend/translate/messages.en.xlf
index 90a1bcac5..158d562df 100644
--- a/frontend/translate/messages.en.xlf
+++ b/frontend/translate/messages.en.xlf
@@ -1533,10 +1533,6 @@
<context context-type="sourcefile">frontend/app/gallery/navigator/navigator.gallery.component.ts</context>
<context context-type="linenumber">1</context>
</context-group>
- <context-group purpose="location">
- <context context-type="sourcefile">frontend/app/gallery/navigator/navigator.gallery.component.ts</context>
- <context context-type="linenumber">1</context>
- </context-group>
<target>Images</target>
</trans-unit>
<trans-unit id="4f20f2d5a6882190892e58b85f6ccbedfa737952" datatype="html">
diff --git a/frontend/translate/messages.hu.xlf b/frontend/translate/messages.hu.xlf
index c6099346e..4d584ebf7 100644
--- a/frontend/translate/messages.hu.xlf
+++ b/frontend/translate/messages.hu.xlf
@@ -1533,10 +1533,6 @@
<context context-type="sourcefile">frontend/app/gallery/navigator/navigator.gallery.component.ts</context>
<context context-type="linenumber">1</context>
</context-group>
- <context-group purpose="location">
- <context context-type="sourcefile">frontend/app/gallery/navigator/navigator.gallery.component.ts</context>
- <context context-type="linenumber">1</context>
- </context-group>
<target>Képek</target>
</trans-unit>
<trans-unit id="4f20f2d5a6882190892e58b85f6ccbedfa737952" datatype="html">
@@ -1904,4 +1900,4 @@
</trans-unit>
</body>
</file>
-</xliff>
+</xliff>
\ No newline at end of file
diff --git a/package.json b/package.json
index 361a4e2a7..269a7cfb0 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
"pretest": "tsc",
"test": "ng test && mocha --recursive test/backend/unit && mocha --recursive test/backend/integration && mocha --recursive test/common/unit ",
"start": "node ./backend/index",
- "run-dev": "ng build --aot --watch --output-path=./dist --i18n-locale en --i18n-format xlf --i18n-file frontend/translate/messages.en.xlf --i18n-missing-translation warning",
+ "run-dev": "ng build --aot --watch --output-path=./dist --i18n-locale en --i18n-file frontend/translate/messages.en.xlf --i18n-missing-translation warning",
"update-translation": "gulp update-translation",
"add-translation": "gulp add-translation"
},