opengnsys
/
oggui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #1138 Add translate and es-en files
testing/ogGui-multibranch/pipeline/head There was a failure building this commit Details

oggui/translations
Alvaro Puente Mella 2024-11-15 13:29:56 +01:00
parent 55af0d10f8
commit 3ad5a11751
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ogWebconsole/src/app/app.module.ts
View File

@ -116,8 +116,6 @@ import { CreateOperativeSystemComponent } from './components/operative-system/cr
import { ShowTemplateContentComponent } from './components/ogboot/pxe/show-template-content/show-template-content.component'; import { ShowTemplateContentComponent } from './components/ogboot/pxe/show-template-content/show-template-content.component';
import { AddClientsToPxeComponent } from './components/ogboot/pxe/add-clients-to-pxe/add-clients-to-pxe.component'; import { AddClientsToPxeComponent } from './components/ogboot/pxe/add-clients-to-pxe/add-clients-to-pxe.component';
import { ClientsComponent } from './components/ogboot/pxe/clients/clients.component'; import { ClientsComponent } from './components/ogboot/pxe/clients/clients.component';
<<<<<<< Updated upstream
=======
import { RepositoriesComponent } from './components/repositories/repositories.component'; import { RepositoriesComponent } from './components/repositories/repositories.component';
import { CreateRepositoryComponent } from './components/repositories/create-repository/create-repository.component'; import { CreateRepositoryComponent } from './components/repositories/create-repository/create-repository.component';
import { ExecuteCommandComponent } from './components/commands/main-commands/execute-command/execute-command.component'; import { ExecuteCommandComponent } from './components/commands/main-commands/execute-command/execute-command.component';
@ -130,7 +128,6 @@ export function HttpLoaderFactory(http: HttpClient) {
return new TranslateHttpLoader(http, './locale/', '.json'); return new TranslateHttpLoader(http, './locale/', '.json');
} }
>>>>>>> Stashed changes
@NgModule({ @NgModule({
declarations: [ declarations: [
AppComponent, AppComponent,
@ -204,6 +201,10 @@ export function HttpLoaderFactory(http: HttpClient) {
ShowTemplateContentComponent, ShowTemplateContentComponent,
AddClientsToPxeComponent, AddClientsToPxeComponent,
ClientsComponent, ClientsComponent,
RepositoriesComponent,
CreateRepositoryComponent,
ExecuteCommandComponent,
ExecuteCommandOuComponent
], ],
bootstrap: [AppComponent], bootstrap: [AppComponent],
imports: [BrowserModule, imports: [BrowserModule,
@ -232,8 +233,6 @@ export function HttpLoaderFactory(http: HttpClient) {
MatDatepickerModule, MatDatepickerModule,
MatNativeDateModule, MatNativeDateModule,
MatSliderModule, MatSliderModule,
<<<<<<< Updated upstream
=======
TranslateModule.forRoot({ TranslateModule.forRoot({
loader: { loader: {
provide: TranslateLoader, provide: TranslateLoader,
@ -242,7 +241,6 @@ export function HttpLoaderFactory(http: HttpClient) {
} }
}), }),
JoyrideModule.forRoot(), JoyrideModule.forRoot(),
>>>>>>> Stashed changes
ToastrModule.forRoot( ToastrModule.forRoot(
{ {
timeOut: 5000, timeOut: 5000,