mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-01-20 08:33:11 +00:00
refactor: replace TSLint with ESLint
This commit is contained in:
committed by
Jovan Krunić
parent
67fb4a43c9
commit
d696215d08
@@ -12,7 +12,12 @@
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
import {CommonModule, HashLocationStrategy, LocationStrategy, registerLocaleData} from '@angular/common';
|
||||
import {
|
||||
CommonModule,
|
||||
HashLocationStrategy,
|
||||
LocationStrategy,
|
||||
registerLocaleData,
|
||||
} from '@angular/common';
|
||||
import {HttpClient} from '@angular/common/http';
|
||||
import localeDe from '@angular/common/locales/de';
|
||||
import {APP_INITIALIZER, NgModule, Provider} from '@angular/core';
|
||||
@@ -21,7 +26,11 @@ import {RouteReuseStrategy} from '@angular/router';
|
||||
import {SplashScreen} from '@ionic-native/splash-screen/ngx';
|
||||
import {StatusBar} from '@ionic-native/status-bar/ngx';
|
||||
import {IonicModule, IonicRouteStrategy} from '@ionic/angular';
|
||||
import {TranslateLoader, TranslateModule, TranslateService} from '@ngx-translate/core';
|
||||
import {
|
||||
TranslateLoader,
|
||||
TranslateModule,
|
||||
TranslateService,
|
||||
} from '@ngx-translate/core';
|
||||
import {TranslateHttpLoader} from '@ngx-translate/http-loader';
|
||||
import moment from 'moment';
|
||||
import 'moment/min/locales';
|
||||
@@ -47,21 +56,33 @@ registerLocaleData(localeDe);
|
||||
/**
|
||||
* Initializes settings from Config before other components
|
||||
*
|
||||
* @param logger TODO
|
||||
* @param settingsProvider provider of settings (e.g. language that has been set)
|
||||
* @param configProvider TODO
|
||||
* @param translateService TODO
|
||||
*/
|
||||
export function initSettingsFactory(logger: NGXLogger,
|
||||
settingsProvider: SettingsProvider,
|
||||
configProvider: ConfigProvider,
|
||||
translateService: TranslateService) {
|
||||
export function initSettingsFactory(
|
||||
logger: NGXLogger,
|
||||
settingsProvider: SettingsProvider,
|
||||
configProvider: ConfigProvider,
|
||||
translateService: TranslateService,
|
||||
) {
|
||||
return async () => {
|
||||
initLogger(logger);
|
||||
await settingsProvider.init();
|
||||
try {
|
||||
// set language from settings
|
||||
if (configProvider.firstSession) {
|
||||
await settingsProvider.setSettingValue('profile', 'language', translateService.getBrowserLang());
|
||||
await settingsProvider.setSettingValue(
|
||||
'profile',
|
||||
'language',
|
||||
translateService.getBrowserLang(),
|
||||
);
|
||||
}
|
||||
const languageCode = (await settingsProvider.getValue('profile', 'language')) as string;
|
||||
const languageCode = (await settingsProvider.getValue(
|
||||
'profile',
|
||||
'language',
|
||||
)) as string;
|
||||
// this language will be used as a fallback when a translation isn't found in the current language
|
||||
translateService.setDefaultLang('en');
|
||||
translateService.use(languageCode);
|
||||
@@ -81,7 +102,7 @@ export function createTranslateLoader(http: HttpClient) {
|
||||
return new TranslateHttpLoader(http, './assets/i18n/', '.json');
|
||||
}
|
||||
|
||||
const providers : Provider[] = [
|
||||
const providers: Provider[] = [
|
||||
StatusBar,
|
||||
SplashScreen,
|
||||
{
|
||||
@@ -95,7 +116,7 @@ const providers : Provider[] = [
|
||||
{
|
||||
provide: APP_INITIALIZER,
|
||||
multi: true,
|
||||
deps: [NGXLogger,SettingsProvider,ConfigProvider,TranslateService],
|
||||
deps: [NGXLogger, SettingsProvider, ConfigProvider, TranslateService],
|
||||
useFactory: initSettingsFactory,
|
||||
},
|
||||
];
|
||||
@@ -122,14 +143,18 @@ const providers : Provider[] = [
|
||||
loader: {
|
||||
deps: [HttpClient],
|
||||
provide: TranslateLoader,
|
||||
useFactory: (createTranslateLoader),
|
||||
useFactory: createTranslateLoader,
|
||||
},
|
||||
}),
|
||||
// use maximal logging level when not in production, minimal (log only fatal errors) in production
|
||||
LoggerModule.forRoot({level: environment.production ? NgxLoggerLevel.FATAL : NgxLoggerLevel.TRACE}),
|
||||
LoggerModule.forRoot({
|
||||
level: environment.production
|
||||
? NgxLoggerLevel.FATAL
|
||||
: NgxLoggerLevel.TRACE,
|
||||
}),
|
||||
],
|
||||
providers:
|
||||
environment.use_fake_backend ? [providers, fakeBackendProvider] : providers,
|
||||
providers: environment.use_fake_backend
|
||||
? [providers, fakeBackendProvider]
|
||||
: providers,
|
||||
})
|
||||
export class AppModule {
|
||||
}
|
||||
export class AppModule {}
|
||||
|
||||
Reference in New Issue
Block a user