Compare commits

...

2 Commits

Author SHA1 Message Date
Alvaro Puente Mella 3ad5a11751 refs #1138 Add translate and es-en files
testing/ogGui-multibranch/pipeline/head There was a failure building this commit Details
2024-11-15 13:29:56 +01:00
Alvaro Puente Mella 55af0d10f8 refs #1138 Add translate and es-en files 2024-11-15 13:29:54 +01:00
2 changed files with 6 additions and 8 deletions

View File

@ -1,12 +1,12 @@
{
"name": "og-webconsole",
"version": "0.0.0",
"version": "0.5.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "og-webconsole",
"version": "0.0.0",
"version": "0.5.0",
"dependencies": {
"@angular/animations": "^18.0.0",
"@angular/cdk": "~18.0.0",

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 { AddClientsToPxeComponent } from './components/ogboot/pxe/add-clients-to-pxe/add-clients-to-pxe.component';
import { ClientsComponent } from './components/ogboot/pxe/clients/clients.component';
<<<<<<< Updated upstream
=======
import { RepositoriesComponent } from './components/repositories/repositories.component';
import { CreateRepositoryComponent } from './components/repositories/create-repository/create-repository.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');
}
>>>>>>> Stashed changes
@NgModule({
declarations: [
AppComponent,
@ -204,6 +201,10 @@ export function HttpLoaderFactory(http: HttpClient) {
ShowTemplateContentComponent,
AddClientsToPxeComponent,
ClientsComponent,
RepositoriesComponent,
CreateRepositoryComponent,
ExecuteCommandComponent,
ExecuteCommandOuComponent
],
bootstrap: [AppComponent],
imports: [BrowserModule,
@ -232,8 +233,6 @@ export function HttpLoaderFactory(http: HttpClient) {
MatDatepickerModule,
MatNativeDateModule,
MatSliderModule,
<<<<<<< Updated upstream
=======
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
@ -242,7 +241,6 @@ export function HttpLoaderFactory(http: HttpClient) {
}
}),
JoyrideModule.forRoot(),
>>>>>>> Stashed changes
ToastrModule.forRoot(
{
timeOut: 5000,