diff --git a/src/app/pages/charts/charts.module.ts b/src/app/pages/charts/charts.module.ts index efaf2fab..e135430c 100644 --- a/src/app/pages/charts/charts.module.ts +++ b/src/app/pages/charts/charts.module.ts @@ -7,11 +7,12 @@ import { routing } from './charts.routing'; import { Charts } from './charts.component'; import { ChartistJs } from './components/chartistJs/chartistJs.component'; import { ChartistJsService } from './components/chartistJs/chartistJs.service'; - +import { AppTranslationModule } from '../../app.translation.module'; @NgModule({ imports: [ CommonModule, + AppTranslationModule, FormsModule, NgaModule, routing diff --git a/src/app/pages/charts/components/chartistJs/chartistJs.html b/src/app/pages/charts/components/chartistJs/chartistJs.html index 4d678f33..2a7def97 100644 --- a/src/app/pages/charts/components/chartistJs/chartistJs.html +++ b/src/app/pages/charts/components/chartistJs/chartistJs.html @@ -1,22 +1,22 @@
- -
Simple line chart
+ +
{{'chart.simple_line_chart'}}
-
Line chart with area
+
{{'chart.line_chart'}}
-
Bi-polar line chart with area only
+
{{'chart.bi_polar_line_chart'}}
- -
Simple bar chart
+ +
{{'chart.simple_bar_chart'}}
-
Multi-line labels bar chart
+
{{'chart.multi_line_labels_bar_chart'}}
-
Stacked bar chart
+
{{'chart.stacked_bar_chart'}}
- +
-
Simple Pie
+
{{'chart.simple_pie'}}
-
Pie with labels
+
{{'chart.pie_with_labels'}}
-
Donut
+
{{'chart.donut'}}
- +
diff --git a/src/app/pages/dashboard/dashboard.html b/src/app/pages/dashboard/dashboard.html index 2df1ae2a..b1d0d3ea 100644 --- a/src/app/pages/dashboard/dashboard.html +++ b/src/app/pages/dashboard/dashboard.html @@ -6,12 +6,12 @@
+ title="dashboard.acquisition_channels" baCardClass="traffic-panel medium-card"> + title="dashboard.users_by_country" baCardClass="medium-card">
@@ -20,7 +20,7 @@
+ title="dashboard.revenue" baCardClass="medium-card">
- @@ -40,11 +40,11 @@
- - diff --git a/src/app/pages/dashboard/pieChart/pieChart.service.ts b/src/app/pages/dashboard/pieChart/pieChart.service.ts index 827f9e2f..bdcbdf65 100644 --- a/src/app/pages/dashboard/pieChart/pieChart.service.ts +++ b/src/app/pages/dashboard/pieChart/pieChart.service.ts @@ -12,22 +12,22 @@ export class PieChartService { return [ { color: pieColor, - description: 'general.dashboard.newVisits', + description: 'dashboard.new_visits', stats: '57,820', icon: 'person', }, { color: pieColor, - description: 'general.dashboard.purchases', + description: 'dashboard.purchases', stats: '$ 89,745', icon: 'money', }, { color: pieColor, - description: 'general.dashboard.activeUsers', + description: 'dashboard.active_users', stats: '178,391', icon: 'face', }, { color: pieColor, - description: 'general.dashboard.returned', + description: 'dashboard.returned', stats: '32,592', icon: 'refresh', } diff --git a/src/app/pages/dashboard/popularApp/popularApp.html b/src/app/pages/dashboard/popularApp/popularApp.html index 88a0b44e..dcdbd5cd 100644 --- a/src/app/pages/dashboard/popularApp/popularApp.html +++ b/src/app/pages/dashboard/popularApp/popularApp.html @@ -1,28 +1,26 @@ diff --git a/src/app/pages/dashboard/todo/todo.html b/src/app/pages/dashboard/todo/todo.html index f8ab6681..b90f1579 100644 --- a/src/app/pages/dashboard/todo/todo.html +++ b/src/app/pages/dashboard/todo/todo.html @@ -1,5 +1,5 @@
- +
diff --git a/src/app/pages/dashboard/trafficChart/trafficChart.html b/src/app/pages/dashboard/trafficChart/trafficChart.html index 3b5f55ec..e28b9ecb 100644 --- a/src/app/pages/dashboard/trafficChart/trafficChart.html +++ b/src/app/pages/dashboard/trafficChart/trafficChart.html @@ -6,7 +6,7 @@
1,900,128 - Views Total + {{'dashboard.traffic_chart.view_total'}}
@@ -26,4 +26,3 @@
- diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts index dde644ad..79877823 100644 --- a/src/app/pages/pages.component.ts +++ b/src/app/pages/pages.component.ts @@ -16,9 +16,9 @@ import { PAGES_MENU } from './pages.menu';