Skip to content

Commit

Permalink
Revert "feat(localization): implement the localization using ngx-tran…
Browse files Browse the repository at this point in the history
…slate (akveo#830)"

This reverts commit 627d62d.
  • Loading branch information
AlbertXingZhang committed Apr 24, 2017
1 parent a43ceb2 commit 5628134
Show file tree
Hide file tree
Showing 15 changed files with 55 additions and 204 deletions.
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
"@angularclass/hmr": "1.2.2",
"@angularclass/hmr-loader": "3.0.2",
"@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
"@ngx-translate/core": "6.0.1",
"@ngx-translate/http-loader": "0.0.3",
"amcharts3": "github:amcharts/amcharts3",
"ammap3": "github:amcharts/ammap3",
"animate.css": "3.5.2",
Expand Down
4 changes: 1 addition & 3 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { HttpModule } from '@angular/http';
import { RouterModule } from '@angular/router';
import { removeNgStyles, createNewHosts, createInputTransfer } from '@angularclass/hmr';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateService } from '@ngx-translate/core';

/*
* Platform and Environment providers/directives/pipes
Expand Down Expand Up @@ -60,8 +59,7 @@ export type StoreType = {

export class AppModule {

constructor(public appRef: ApplicationRef,
public appState: AppState) {
constructor(public appRef: ApplicationRef, public appState: AppState) {
}

hmrOnInit(store: StoreType) {
Expand Down
31 changes: 0 additions & 31 deletions src/app/app.translation.module.ts

This file was deleted.

13 changes: 7 additions & 6 deletions src/app/pages/dashboard/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

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

<ba-card class="col-xlg-6 col-xl-6 col-lg-12 col-sm-12 col-12"
title="dashboard.users_by_country" baCardClass="medium-card">
title="Users by Country" baCardClass="medium-card">
<users-map></users-map>
</ba-card>
</div>
Expand All @@ -20,7 +20,7 @@
<div class="col-xlg-9 col-xl-6 col-lg-6 col-md-12 col-sm-12 col-12">
<div class="row">
<ba-card class="col-xlg-8 col-xl-12 col-lg-12 col-md-7 col-sm-12 col-12"
title="dashboard.revenue" baCardClass="medium-card">
title="Revenue" baCardClass="medium-card">
<line-chart></line-chart>
</ba-card>
<ba-card class="col-xlg-4 col-xl-12 col-lg-12 col-md-5 col-sm-12 col-12"
Expand All @@ -31,7 +31,7 @@
</div>

<div class="col-xlg-3 col-xl-6 col-lg-6 col-md-12 col-sm-12 col-12">
<ba-card title="dashboard.feed"
<ba-card title="Feed"
baCardClass="large-card with-scroll feed-panel">
<feed></feed>
</ba-card>
Expand All @@ -40,12 +40,13 @@
</div>

<div class="row shift-up">
<ba-card class="col-xlg-3 col-lg-6 col-md-12 col-sm-12 col-12" title="dashboard.todo_list"
<ba-card class="col-xlg-3 col-lg-6 col-md-12 col-sm-12 col-12" title="To Do List"
baCardClass="xmedium-card feed-comply-panel with-scroll todo-panel">
<todo></todo>
</ba-card>
<ba-card class="col-xlg-6 col-lg-6 col-md-12 col-sm-12 col-12" title="dashboard.calendar"
<ba-card class="col-xlg-6 col-lg-6 col-md-12 col-sm-12 col-12" title="Calendar"
baCardClass="xmedium-card feed-comply-panel with-scroll calendar-panel">
<calendar></calendar>
</ba-card>
</div>

2 changes: 0 additions & 2 deletions src/app/pages/dashboard/dashboard.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { AppTranslationModule } from '../../app.translation.module';
import { NgaModule } from '../../theme/nga.module';

import { Dashboard } from './dashboard.component';
Expand All @@ -27,7 +26,6 @@ import { UsersMapService } from './usersMap/usersMap.service';
imports: [
CommonModule,
FormsModule,
AppTranslationModule,
NgaModule,
routing
],
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/dashboard/pieChart/pieChart.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<span class="percent"></span>
</div>
<div class="description">
<div translate>{{ chart.description }}</div>
<div>{{ chart.description }}</div>
<div class="description-stats">{{ chart.stats }}</div>
</div>
<i class="chart-icon i-{{ chart.icon }}"></i>
Expand Down
8 changes: 4 additions & 4 deletions src/app/pages/dashboard/pieChart/pieChart.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ export class PieChartService {
return [
{
color: pieColor,
description: 'dashboard.new_visits',
description: 'New Visits',
stats: '57,820',
icon: 'person',
}, {
color: pieColor,
description: 'dashboard.purchases',
description: 'Purchases',
stats: '$ 89,745',
icon: 'money',
}, {
color: pieColor,
description: 'dashboard.active_users',
description: 'Active Users',
stats: '178,391',
icon: 'face',
}, {
color: pieColor,
description: 'dashboard.returned',
description: 'Returned',
stats: '32,592',
icon: 'refresh',
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="col-md-4">
<label class="radio-inline custom-radio nowrap">
<input type="radio" name="inlineRadioOptions" id="inlineRadio1" value="option1">
<span translate>{{'general.forms.option1'}}</span>
<span>Option 1</span>
</label>
</div>
<div class="col-md-4">
Expand Down
2 changes: 0 additions & 2 deletions src/app/pages/forms/forms.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule as AngularFormsModule } from '@angular/forms';
import { AppTranslationModule } from '../../app.translation.module';
import { NgaModule } from '../../theme/nga.module';
import { NgbRatingModule } from '@ng-bootstrap/ng-bootstrap';

Expand All @@ -28,7 +27,6 @@ import { WithoutLabelsForm } from './components/layouts/components/withoutLabels
imports: [
CommonModule,
AngularFormsModule,
AppTranslationModule,
NgaModule,
NgbRatingModule,
routing
Expand Down
Loading

0 comments on commit 5628134

Please sign in to comment.