Skip to content

Commit 5628134

Browse files
Revert "feat(localization): implement the localization using ngx-translate (akveo#830)"
This reverts commit 627d62d.
1 parent a43ceb2 commit 5628134

File tree

15 files changed

+55
-204
lines changed

15 files changed

+55
-204
lines changed

package.json

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
"@angularclass/hmr": "1.2.2",
2020
"@angularclass/hmr-loader": "3.0.2",
2121
"@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
22-
"@ngx-translate/core": "6.0.1",
23-
"@ngx-translate/http-loader": "0.0.3",
2422
"amcharts3": "github:amcharts/amcharts3",
2523
"ammap3": "github:amcharts/ammap3",
2624
"animate.css": "3.5.2",

src/app/app.module.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { HttpModule } from '@angular/http';
55
import { RouterModule } from '@angular/router';
66
import { removeNgStyles, createNewHosts, createInputTransfer } from '@angularclass/hmr';
77
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
8-
import { TranslateService } from '@ngx-translate/core';
98

109
/*
1110
* Platform and Environment providers/directives/pipes
@@ -60,8 +59,7 @@ export type StoreType = {
6059

6160
export class AppModule {
6261

63-
constructor(public appRef: ApplicationRef,
64-
public appState: AppState) {
62+
constructor(public appRef: ApplicationRef, public appState: AppState) {
6563
}
6664

6765
hmrOnInit(store: StoreType) {

src/app/app.translation.module.ts

-31
This file was deleted.

src/app/pages/dashboard/dashboard.html

+7-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<div class="row">
88
<ba-card class="col-xlg-6 col-xl-6 col-lg-12 col-sm-12 col-12"
9-
title="dashboard.acquisition_channels" baCardClass="traffic-panel medium-card">
9+
title="Acquisition Channels" baCardClass="traffic-panel medium-card">
1010
<traffic-chart></traffic-chart>
1111
</ba-card>
1212

1313
<ba-card class="col-xlg-6 col-xl-6 col-lg-12 col-sm-12 col-12"
14-
title="dashboard.users_by_country" baCardClass="medium-card">
14+
title="Users by Country" baCardClass="medium-card">
1515
<users-map></users-map>
1616
</ba-card>
1717
</div>
@@ -20,7 +20,7 @@
2020
<div class="col-xlg-9 col-xl-6 col-lg-6 col-md-12 col-sm-12 col-12">
2121
<div class="row">
2222
<ba-card class="col-xlg-8 col-xl-12 col-lg-12 col-md-7 col-sm-12 col-12"
23-
title="dashboard.revenue" baCardClass="medium-card">
23+
title="Revenue" baCardClass="medium-card">
2424
<line-chart></line-chart>
2525
</ba-card>
2626
<ba-card class="col-xlg-4 col-xl-12 col-lg-12 col-md-5 col-sm-12 col-12"
@@ -31,7 +31,7 @@
3131
</div>
3232

3333
<div class="col-xlg-3 col-xl-6 col-lg-6 col-md-12 col-sm-12 col-12">
34-
<ba-card title="dashboard.feed"
34+
<ba-card title="Feed"
3535
baCardClass="large-card with-scroll feed-panel">
3636
<feed></feed>
3737
</ba-card>
@@ -40,12 +40,13 @@
4040
</div>
4141

4242
<div class="row shift-up">
43-
<ba-card class="col-xlg-3 col-lg-6 col-md-12 col-sm-12 col-12" title="dashboard.todo_list"
43+
<ba-card class="col-xlg-3 col-lg-6 col-md-12 col-sm-12 col-12" title="To Do List"
4444
baCardClass="xmedium-card feed-comply-panel with-scroll todo-panel">
4545
<todo></todo>
4646
</ba-card>
47-
<ba-card class="col-xlg-6 col-lg-6 col-md-12 col-sm-12 col-12" title="dashboard.calendar"
47+
<ba-card class="col-xlg-6 col-lg-6 col-md-12 col-sm-12 col-12" title="Calendar"
4848
baCardClass="xmedium-card feed-comply-panel with-scroll calendar-panel">
4949
<calendar></calendar>
5050
</ba-card>
5151
</div>
52+

src/app/pages/dashboard/dashboard.module.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { FormsModule } from '@angular/forms';
4-
import { AppTranslationModule } from '../../app.translation.module';
54
import { NgaModule } from '../../theme/nga.module';
65

76
import { Dashboard } from './dashboard.component';
@@ -27,7 +26,6 @@ import { UsersMapService } from './usersMap/usersMap.service';
2726
imports: [
2827
CommonModule,
2928
FormsModule,
30-
AppTranslationModule,
3129
NgaModule,
3230
routing
3331
],

src/app/pages/dashboard/pieChart/pieChart.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<span class="percent"></span>
88
</div>
99
<div class="description">
10-
<div translate>{{ chart.description }}</div>
10+
<div>{{ chart.description }}</div>
1111
<div class="description-stats">{{ chart.stats }}</div>
1212
</div>
1313
<i class="chart-icon i-{{ chart.icon }}"></i>

src/app/pages/dashboard/pieChart/pieChart.service.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ export class PieChartService {
1212
return [
1313
{
1414
color: pieColor,
15-
description: 'dashboard.new_visits',
15+
description: 'New Visits',
1616
stats: '57,820',
1717
icon: 'person',
1818
}, {
1919
color: pieColor,
20-
description: 'dashboard.purchases',
20+
description: 'Purchases',
2121
stats: '$ 89,745',
2222
icon: 'money',
2323
}, {
2424
color: pieColor,
25-
description: 'dashboard.active_users',
25+
description: 'Active Users',
2626
stats: '178,391',
2727
icon: 'face',
2828
}, {
2929
color: pieColor,
30-
description: 'dashboard.returned',
30+
description: 'Returned',
3131
stats: '32,592',
3232
icon: 'refresh',
3333
}

src/app/pages/forms/components/inputs/components/checkboxInputs/checkboxInputs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="col-md-4">
77
<label class="radio-inline custom-radio nowrap">
88
<input type="radio" name="inlineRadioOptions" id="inlineRadio1" value="option1">
9-
<span translate>{{'general.forms.option1'}}</span>
9+
<span>Option 1</span>
1010
</label>
1111
</div>
1212
<div class="col-md-4">

src/app/pages/forms/forms.module.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { FormsModule as AngularFormsModule } from '@angular/forms';
4-
import { AppTranslationModule } from '../../app.translation.module';
54
import { NgaModule } from '../../theme/nga.module';
65
import { NgbRatingModule } from '@ng-bootstrap/ng-bootstrap';
76

@@ -28,7 +27,6 @@ import { WithoutLabelsForm } from './components/layouts/components/withoutLabels
2827
imports: [
2928
CommonModule,
3029
AngularFormsModule,
31-
AppTranslationModule,
3230
NgaModule,
3331
NgbRatingModule,
3432
routing

0 commit comments

Comments
 (0)