Skip to content

Commit

Permalink
Upgrade ng2-translate to ngx-translate. Resolves #28 and #26
Browse files Browse the repository at this point in the history
  • Loading branch information
meeroslav committed Feb 19, 2017
1 parent 59d39fa commit 6eb1807
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 12 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
"typings": "index.d.ts",
"homepage": "https://github.com/Greentube/localize-router",
"peerDependencies": {
"@angular/core": "^2.0.0",
"@angular/common": "^2.0.0",
"@angular/http": "^2.0.0",
"@angular/router": "^3.0.0",
"@angular/core": ">=2.0.0 || >=4.0.0-beta.0",
"@angular/common": ">=2.0.0 || >=4.0.0-beta.0",
"@angular/http": ">=2.0.0 || >=4.0.0-beta.0",
"@angular/router": ">=3.0.0 || >=4.0.0-beta.0",
"rxjs": "^5.0.0",
"ng2-translate": "^5.0.0"
"@ngx-translate/core": "^6.0.0"
},
"devDependencies": {
"@angular/common": "2.4.0",
Expand Down Expand Up @@ -70,7 +70,7 @@
"karma-sourcemap-loader": "0.3.7",
"karma-webpack": "2.0.2",
"loader-utils": "0.2.16",
"ng2-translate": "5.0.0",
"@ngx-translate/core": "6.0.0",
"reflect-metadata": "0.1.8",
"rxjs": "5.0.1",
"semantic-release": "4.3.5",
Expand Down
2 changes: 1 addition & 1 deletion src/localize-router.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { LocalizeRouterService } from './localize-router.service';
import { LocalizeParser, RAW_ROUTES, StaticParserLoader, parserInitializer } from './localize-router.parser';
import { RouterModule, Routes } from '@angular/router';
import { LocalizeRouterPipe } from './localize-router.pipe';
import { TranslateModule, TranslateService } from 'ng2-translate';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { Location, CommonModule } from '@angular/common';

export * from './localize-router.pipe';
Expand Down
3 changes: 1 addition & 2 deletions src/localize-router.parser.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Http, Response } from '@angular/http';
import { OpaqueToken } from '@angular/core';
import { Routes, Route } from '@angular/router';
import { TranslateService } from 'ng2-translate';
import { TranslateService } from '@ngx-translate/core';
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
import { Location } from '@angular/common';
Expand Down Expand Up @@ -310,7 +310,6 @@ export class StaticParserLoader extends LocalizeParser {
}
}


/**
* Pre-loading helper functions
* Necessary evil for AOT
Expand Down
2 changes: 1 addition & 1 deletion tests/localize-router.parser.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {LocalizeParser, ManualParserLoader} from '../src/localize-router.parser'
import {getTestBed, TestBed, fakeAsync, tick} from '@angular/core/testing';
import {Routes} from '@angular/router';
import {Observable} from 'rxjs/Observable';
import {TranslateService} from 'ng2-translate';
import {TranslateService} from '@ngx-translate/core';
import {Location, CommonModule} from '@angular/common';

class FakeTranslateService {
Expand Down
2 changes: 1 addition & 1 deletion tests/localize-router.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {getTestBed, TestBed, fakeAsync, tick} from '@angular/core/testing';
import {Routes, Router, Event, NavigationStart, NavigationEnd} from '@angular/router';
import {Observable} from 'rxjs/Observable';
import {Subject} from 'rxjs/Subject';
import {TranslateService} from 'ng2-translate';
import {TranslateService} from '@ngx-translate/core';
import { CommonModule, Location } from '@angular/common';

class FakeTranslateService {
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = {
},

// require those dependencies but don't bundle them
externals: [/^\@angular\//, /^rxjs\//, 'ng2-translate'],
externals: [/^\@angular\//, /^rxjs\//, /^\@ngx-translate\//],
target: 'node',

module: {
Expand Down

0 comments on commit 6eb1807

Please sign in to comment.