mirror of
https://github.com/mempool/mempool.git
synced 2025-10-11 10:53:04 +02:00
Merge branch 'master' into simon/angular-universal
* master: Update list of supported locales Add one more fix to nginx.conf for i18n Remove unused i18n tags in frontend/src/index.html Update translations from Transifex Enable 'fr' locale for French Corrected some missing spaces on transactions page and a blank render bug when confirmation time is below 1 minute. Implement i18n support in frontend using Angular + Transifex + NGINX # Conflicts: # frontend/src/app/app.constants.ts # frontend/sync-assets.js
This commit is contained in:
@@ -47,6 +47,7 @@ import { faAngleDoubleDown, faAngleDoubleUp, faAngleDown, faAngleUp, faBolt, faC
|
||||
faLink, faList, faSearch, faTachometerAlt, faThList, faTint, faTv } from '@fortawesome/free-solid-svg-icons';
|
||||
import { ApiDocsComponent } from './components/api-docs/api-docs.component';
|
||||
import { TermsOfServiceComponent } from './components/terms-of-service/terms-of-service.component';
|
||||
import { TranslationStringsComponent } from './components/translation-strings/translation-strings.component';
|
||||
import { StorageService } from './services/storage.service';
|
||||
import { HttpCacheInterceptor } from './services/http-cache.interceptor';
|
||||
|
||||
@@ -83,6 +84,7 @@ import { HttpCacheInterceptor } from './services/http-cache.interceptor';
|
||||
DashboardComponent,
|
||||
ApiDocsComponent,
|
||||
TermsOfServiceComponent,
|
||||
TranslationStringsComponent,
|
||||
],
|
||||
imports: [
|
||||
BrowserModule.withServerTransition({ appId: 'serverApp' }),
|
||||
|
Reference in New Issue
Block a user