Merge branch 'ngforward' into cleaning-the-house

ABNER SILVA DE OLIVEIRA
2 parents 525113a3 833e19f2
Showing 16 changed files with 89 additions and 19 deletions Show diff stats
bower.json
gulp/build.js
src/app/components/auth/login.html
src/app/components/language-selector/language-selector.component.spec.ts
src/app/components/language-selector/language-selector.component.ts
src/app/components/navbar/navbar.html
src/app/components/navbar/navbar.spec.ts
src/app/components/noosfero-activities/activity/new_friendship.html
src/app/components/noosfero/date-format/date-format.filter.spec.ts
src/app/components/noosfero/date-format/date-format.filter.ts
src/app/content-viewer/navbar-actions.html
src/app/index.config.ts
src/app/index.ts
src/languages/en.json
src/languages/pt.json
src/spec/mocks.ts
@@ -20,7 +20,7 @@
     "font-awesome": "fontawesome#~4.5.0",
     "ngstorage": "~0.3.10",
     "bootswatch": "~3.3.6",
-    "angular-moment": "~0.10.3",
+    "angular-moment": "~1.0.0-beta.4",
     "lodash": "3.10.1",
     "angular-filter": "~0.5.8",
     "angular-deckgrid": "~0.5.0",
@@ -32,7 +32,8 @@
     "angular-translate-loader-static-files": "^2.10.0",
     "angular-translate-handler-log": "^2.10.0",
     "angular-dynamic-locale": "^0.1.30",
-    "angular-i18n": "^1.5.0"
+    "angular-i18n": "^1.5.0",
+    "angular-load": "^0.4.1"
   },
   "devDependencies": {
     "angular-mocks": "~1.5.0"
@@ -45,6 +45,9 @@ gulp.task(&#39;html&#39;, [&#39;inject&#39;, &#39;partials&#39;], function () {
     .pipe($.rev())
     .pipe(jsFilter)
     .pipe($.replace('assets/images/', noosferoThemePrefix + 'assets/images/'))
+    .pipe($.replace('/languages/', noosferoThemePrefix + 'languages/'))
+    .pipe($.replace('bower_components/angular-i18n/', noosferoThemePrefix + 'locale/angular-i18n/'))
+    .pipe($.replace('bower_components/moment/', noosferoThemePrefix + 'locale/moment/'))
     .pipe($.sourcemaps.init())
     .pipe($.ngAnnotate())
     .pipe($.uglify({ preserveComments: $.uglifySaveLicense })).on('error', conf.errorHandler('Uglify'))
@@ -81,6 +84,14 @@ gulp.task(&#39;fonts&#39;, function () {
     .pipe(gulp.dest(path.join(conf.paths.dist, '/fonts/')));
 });
  
+gulp.task('locale', function () {
+  return gulp.src([
+    path.join("bower_components/angular-i18n", '*.js'),
+    path.join("bower_components/moment/locale", '*.js'),
+  ], {base: 'bower_components/'})
+    .pipe(gulp.dest(path.join(conf.paths.dist, '/locale/')));
+});
+
 gulp.task('other', function () {
   var fileFilter = $.filter(function (file) {
     return file.stat.isFile();
@@ -98,4 +109,4 @@ gulp.task(&#39;clean&#39;, function () {
   return $.del([path.join(conf.paths.dist, '/'), path.join(conf.paths.tmp, '/')]);
 });
  
-gulp.task('build', ['html', 'fonts', 'other']);
+gulp.task('build', ['html', 'fonts', 'other', 'locale']);
 <div class="modal-header">
-  <h3 class="modal-title">Login</h3>
+  <h3 class="modal-title">{{"auth.title" | translate}}</h3>
 </div>
 <div class="modal-body">
   <form>
     <div class="form-group">
-      <label for="exampleInputEmail1">Login / Email address</label>
+      <label for="exampleInputEmail1">{{"auth.form.login" | translate}}</label>
       <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Login / Email" ng-model="vm.credentials.username">
     </div>
     <div class="form-group">
-      <label for="exampleInputPassword1">Password</label>
+      <label for="exampleInputPassword1">{{"auth.form.password" | translate}}</label>
       <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password" ng-model="vm.credentials.password">
     </div>
-    <button type="submit" class="btn btn-default" ng-click="vm.login()">Login</button>
+    <button type="submit" class="btn btn-default" ng-click="vm.login()">{{"auth.form.login_button" | translate}}</button>
   </form>
 </div>
@@ -25,13 +25,24 @@ describe(&quot;Components&quot;, () =&gt; {
                 }),
                 provide('tmhDynamicLocale', {
                     useValue: helpers.mocks.tmhDynamicLocale
+                }),
+                provide('amMoment', {
+                    useValue: helpers.mocks.amMoment
+                }),
+                provide('angularLoad', {
+                    useValue: helpers.mocks.angularLoad
                 })
             ].concat(helpers.provideFilters("translateFilter"))
         })
         class BlockContainerComponent { }
  
         it("set available languages when change language", () => {
-            let component: LanguageSelector = new LanguageSelector(<any>helpers.mocks.$translate, <any>helpers.mocks.tmhDynamicLocale);
+            let component: LanguageSelector = new LanguageSelector(
+                <any>helpers.mocks.$translate,
+                <any>helpers.mocks.tmhDynamicLocale,
+                <any>helpers.mocks.amMoment,
+                <any>helpers.mocks.angularLoad
+            );
             component.availableLanguages = null;
             expect(component.availableLanguages).toBeNull();
             component.changeLanguage('en');
@@ -4,12 +4,16 @@ import {Component, Inject} from &quot;ng-forward&quot;;
     selector: "language-selector",
     templateUrl: "app/components/language-selector/language-selector.html"
 })
-@Inject("$translate", "tmhDynamicLocale")
+@Inject("$translate", "tmhDynamicLocale", "amMoment", "angularLoad")
 export class LanguageSelector {
  
     availableLanguages: any;
  
-    constructor(private $translate: angular.translate.ITranslateService, private tmhDynamicLocale: any) {
+    constructor(private $translate: angular.translate.ITranslateService,
+        private tmhDynamicLocale: any,
+        private amMoment: any,
+        private angularLoad: any) {
+
         this.changeLanguage(tmhDynamicLocale.get() || $translate.use());
     }
  
@@ -18,6 +22,7 @@ export class LanguageSelector {
     }
  
     changeLanguage(language: string) {
+        this.changeMomentLocale(language);
         this.tmhDynamicLocale.set(language);
         this.$translate.use(language).then((lang) => {
             this.availableLanguages = {
@@ -27,4 +32,13 @@ export class LanguageSelector {
         });
     }
  
+    private changeMomentLocale(language: string) {
+        let localePromise = Promise.resolve();
+        if (language != "en") {
+            localePromise = this.angularLoad.loadScript(`/bower_components/moment/locale/${language}.js`);
+        }
+        localePromise.then(() => {
+            this.amMoment.changeLocale(language);
+        });
+    }
 }
@@ -2,7 +2,7 @@
   <div class="container-fluid">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle collapsed" ng-click="isCollapsed = !isCollapsed">
-        <span class="sr-only">Toggle navigation</span>
+        <span class="sr-only">{{"navbar.toggle_menu" | translate}}</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
@@ -77,6 +77,12 @@ describe(&quot;Components&quot;, () =&gt; {
                     }),
                     provide('tmhDynamicLocale', {
                         useValue: helpers.mocks.tmhDynamicLocale
+                    }),
+                    provide('amMoment', {
+                        useValue: helpers.mocks.amMoment
+                    }),
+                    provide('angularLoad', {
+                        useValue: helpers.mocks.angularLoad
                     })
                 ].concat(helpers.provideFilters("translateFilter")),
                 directives: [Navbar],
@@ -5,7 +5,7 @@
   <timeline-heading>
     <h4 class="timeline-title">
       <a ui-sref="main.profile.info({profile: ctrl.activity.user.identifier})"><strong ng-bind="ctrl.activity.user.name"></strong></a>
-      <span> has made <span ng-bind="ctrl.activity.params.friend_name.length"></span> new friend(s): </span>
+      <span> {{"activities.new_friendship.description" | translate:{friends: ctrl.activity.params.friend_name.length} }} </span>
       <span class="comma-separated">
         <a class="separated-item" ui-sref="main.profile.info({profile: ctrl.activity.params.friend_url[$index].profile})" ng-repeat="friend in ctrl.activity.params.friend_name">
           <strong ng-bind="friend"></strong>
@@ -5,12 +5,13 @@ describe(&quot;Filters&quot;, () =&gt; {
     describe("Date Format Filter", () => {
  
         beforeEach(angular.mock.module("templates"));
+        beforeEach(angular.mock.module("angularMoment"));
  
         it("convert date from the format returned by noosfero api to an ISO format", done => {
             let date = "2016/03/10 10:46:47";
             let htmlTemplate = `{{ '${date}' | dateFormat }}`;
             quickCreateComponent({ providers: [DateFormat], template: htmlTemplate }).then(fixture => {
-                expect(fixture.debugElement.text()).toEqual('"2016-03-10T13:46:47.000Z"');
+                expect(fixture.debugElement.text()).toEqual('2016-03-10T13:46:47.000Z');
                 done();
             });
         });
 import {Pipe, Inject} from "ng-forward";
  
 @Pipe("dateFormat")
+@Inject("amParseFilter")
 export class DateFormat {
  
+    constructor(private amParseFilter: any) { }
+
     transform(date: string, options: any) {
-        return moment(date, "YYYY/MM/DD HH:mm:ss");
+        return this.amParseFilter(date, "YYYY/MM/DD HH:mm:ss").toISOString();
     }
  
 }
 <ul class="nav navbar-nav">
   <li ng-show="vm.profile">
     <a href="#" role="button" ui-sref="main.profile.cms({profile: vm.profile.identifier})">
-      <i class="fa fa-file fa-fw fa-lg"></i> New Post
+      <i class="fa fa-file fa-fw fa-lg"></i> {{"navbar.content_viewer_actions.new_post" | translate}}
     </a>
   </li>
 </ul>
@@ -32,7 +32,6 @@ function configTranslation($translateProvider: angular.translate.ITranslateProvi
     $translateProvider.useMissingTranslationHandlerLog();
     $translateProvider.preferredLanguage('en');
     $translateProvider.useSanitizeValueStrategy('escape');
-    //FIXME fix location pattern
     tmhDynamicLocaleProvider.localeLocationPattern('bower_components/angular-i18n/angular-locale_{{locale}}.js');
     tmhDynamicLocaleProvider.useCookieStorage();
 }
@@ -18,7 +18,7 @@ let noosferoApp: any = bundle(&quot;noosferoApp&quot;, Main, [&quot;ngAnimate&quot;, &quot;ngCookies&quot;, &quot;n
     "ui.router", "ui.bootstrap", "toastr",
     "angularMoment", "angular.filter", "akoenig.deckgrid",
     "angular-timeline", "duScroll", "oitozero.ngSweetAlert",
-    "pascalprecht.translate", "tmh.dynamicLocale"]).publish();
+    "pascalprecht.translate", "tmh.dynamicLocale", "angularLoad"]).publish();
  
 NoosferoApp.angularModule = noosferoApp;
  
@@ -5,10 +5,17 @@
   "navbar.settings": "Settings",
   "navbar.logout": "Log Out",
   "navbar.login": "Login",
+  "navbar.toggle_menu": "Toggle navigation",
   "language.en": "English",
   "language.pt": "Portuguese",
   "language.selector": "Language",
   "profile.wall": "Profile Wall",
   "activities.create_article.description": "has published on",
-  "activities.add_member_in_community.description": "has joined the community"
+  "activities.add_member_in_community.description": "has joined the community",
+  "activities.new_friendship.description": "has made {{friends}} new friend(s):",
+  "auth.title": "Login",
+  "auth.form.login": "Login / Email address",
+  "auth.form.password": "Password",
+  "auth.form.login_button": "Login",
+  "navbar.content_viewer_actions.new_post": "New Post"
 }
@@ -5,10 +5,17 @@
   "navbar.settings": "Configurações",
   "navbar.logout": "Sair",
   "navbar.login": "Login",
+  "navbar.toggle_menu": "Abrir Menu",
   "language.en": "Inglês",
   "language.pt": "Português",
   "language.selector": "Idioma",
   "profile.wall": "Mural do Perfil",
   "activities.create_article.description": "publicou em",
-  "activities.add_member_in_community.description": "entrou na comunidade"
+  "activities.add_member_in_community.description": "entrou na comunidade",
+  "activities.new_friendship.description": "fez {{friends}} novo(s) amigo(s):",
+  "auth.title": "Login",
+  "auth.form.login": "Login / Email",
+  "auth.form.password": "Senha",
+  "auth.form.login_button": "Login",
+  "navbar.content_viewer_actions.new_post": "Novo Artigo"
 }
@@ -54,5 +54,15 @@ export var mocks = {
     tmhDynamicLocale: {
         get: () => { },
         set: (lang: string) => { }
+    },
+    amMoment: {
+        changeLocale: () => { }
+    },
+    angularLoad: {
+        loadScript: (script?: string) => {
+            return {
+                then: (func?: any) => { if (func) func() }
+            }
+        }
     }
 };
...	...	@@ -20,7 +20,7 @@
20	20	"font-awesome": "fontawesome#~4.5.0",
21	21	"ngstorage": "~0.3.10",
22	22	"bootswatch": "~3.3.6",
23		- "angular-moment": "~0.10.3",
	23	+ "angular-moment": "~1.0.0-beta.4",
24	24	"lodash": "3.10.1",
25	25	"angular-filter": "~0.5.8",
26	26	"angular-deckgrid": "~0.5.0",
...	...	@@ -32,7 +32,8 @@
32	32	"angular-translate-loader-static-files": "^2.10.0",
33	33	"angular-translate-handler-log": "^2.10.0",
34	34	"angular-dynamic-locale": "^0.1.30",
35		- "angular-i18n": "^1.5.0"
	35	+ "angular-i18n": "^1.5.0",
	36	+ "angular-load": "^0.4.1"
36	37	},
37	38	"devDependencies": {
38	39	"angular-mocks": "~1.5.0"
...	...
...	...	@@ -45,6 +45,9 @@ gulp.task('html', ['inject', 'partials'], function () {
45	45	.pipe($.rev())
46	46	.pipe(jsFilter)
47	47	.pipe($.replace('assets/images/', noosferoThemePrefix + 'assets/images/'))
	48	+ .pipe($.replace('/languages/', noosferoThemePrefix + 'languages/'))
	49	+ .pipe($.replace('bower_components/angular-i18n/', noosferoThemePrefix + 'locale/angular-i18n/'))
	50	+ .pipe($.replace('bower_components/moment/', noosferoThemePrefix + 'locale/moment/'))
48	51	.pipe($.sourcemaps.init())
49	52	.pipe($.ngAnnotate())
50	53	.pipe($.uglify({ preserveComments: $.uglifySaveLicense })).on('error', conf.errorHandler('Uglify'))
...	...	@@ -81,6 +84,14 @@ gulp.task('fonts', function () {
81	84	.pipe(gulp.dest(path.join(conf.paths.dist, '/fonts/')));
82	85	});
83	86
	87	+gulp.task('locale', function () {
	88	+ return gulp.src([
	89	+ path.join("bower_components/angular-i18n", '*.js'),
	90	+ path.join("bower_components/moment/locale", '*.js'),
	91	+ ], {base: 'bower_components/'})
	92	+ .pipe(gulp.dest(path.join(conf.paths.dist, '/locale/')));
	93	+});
	94	+
84	95	gulp.task('other', function () {
85	96	var fileFilter = $.filter(function (file) {
86	97	return file.stat.isFile();
...	...	@@ -98,4 +109,4 @@ gulp.task('clean', function () {
98	109	return $.del([path.join(conf.paths.dist, '/'), path.join(conf.paths.tmp, '/')]);
99	110	});
100	111
101		-gulp.task('build', ['html', 'fonts', 'other']);
	112	+gulp.task('build', ['html', 'fonts', 'other', 'locale']);
...	...
1	1	<div class="modal-header">
2		- <h3 class="modal-title">Login</h3>
	2	+ <h3 class="modal-title">{{"auth.title" \| translate}}</h3>
3	3	</div>
4	4	<div class="modal-body">
5	5	<form>
6	6	<div class="form-group">
7		- <label for="exampleInputEmail1">Login / Email address</label>
	7	+ <label for="exampleInputEmail1">{{"auth.form.login" \| translate}}</label>
8	8	<input type="text" class="form-control" id="exampleInputEmail1" placeholder="Login / Email" ng-model="vm.credentials.username">
9	9	</div>
10	10	<div class="form-group">
11		- <label for="exampleInputPassword1">Password</label>
	11	+ <label for="exampleInputPassword1">{{"auth.form.password" \| translate}}</label>
12	12	<input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password" ng-model="vm.credentials.password">
13	13	</div>
14		- <button type="submit" class="btn btn-default" ng-click="vm.login()">Login</button>
	14	+ <button type="submit" class="btn btn-default" ng-click="vm.login()">{{"auth.form.login_button" \| translate}}</button>
15	15	</form>
16	16	</div>
...	...
...	...	@@ -25,13 +25,24 @@ describe("Components", () => {
25	25	}),
26	26	provide('tmhDynamicLocale', {
27	27	useValue: helpers.mocks.tmhDynamicLocale
	28	+ }),
	29	+ provide('amMoment', {
	30	+ useValue: helpers.mocks.amMoment
	31	+ }),
	32	+ provide('angularLoad', {
	33	+ useValue: helpers.mocks.angularLoad
28	34	})
29	35	].concat(helpers.provideFilters("translateFilter"))
30	36	})
31	37	class BlockContainerComponent { }
32	38
33	39	it("set available languages when change language", () => {
34		- let component: LanguageSelector = new LanguageSelector(<any>helpers.mocks.$translate, <any>helpers.mocks.tmhDynamicLocale);
	40	+ let component: LanguageSelector = new LanguageSelector(
	41	+ <any>helpers.mocks.$translate,
	42	+ <any>helpers.mocks.tmhDynamicLocale,
	43	+ <any>helpers.mocks.amMoment,
	44	+ <any>helpers.mocks.angularLoad
	45	+ );
35	46	component.availableLanguages = null;
36	47	expect(component.availableLanguages).toBeNull();
37	48	component.changeLanguage('en');
...	...
...	...	@@ -4,12 +4,16 @@ import {Component, Inject} from "ng-forward";
4	4	selector: "language-selector",
5	5	templateUrl: "app/components/language-selector/language-selector.html"
6	6	})
7		-@Inject("$translate", "tmhDynamicLocale")
	7	+@Inject("$translate", "tmhDynamicLocale", "amMoment", "angularLoad")
8	8	export class LanguageSelector {
9	9
10	10	availableLanguages: any;
11	11
12		- constructor(private $translate: angular.translate.ITranslateService, private tmhDynamicLocale: any) {
	12	+ constructor(private $translate: angular.translate.ITranslateService,
	13	+ private tmhDynamicLocale: any,
	14	+ private amMoment: any,
	15	+ private angularLoad: any) {
	16	+
13	17	this.changeLanguage(tmhDynamicLocale.get() \|\| $translate.use());
14	18	}
15	19
...	...	@@ -18,6 +22,7 @@ export class LanguageSelector {
18	22	}
19	23
20	24	changeLanguage(language: string) {
	25	+ this.changeMomentLocale(language);
21	26	this.tmhDynamicLocale.set(language);
22	27	this.$translate.use(language).then((lang) => {
23	28	this.availableLanguages = {
...	...	@@ -27,4 +32,13 @@ export class LanguageSelector {
27	32	});
28	33	}
29	34
	35	+ private changeMomentLocale(language: string) {
	36	+ let localePromise = Promise.resolve();
	37	+ if (language != "en") {
	38	+ localePromise = this.angularLoad.loadScript(`/bower_components/moment/locale/${language}.js`);
	39	+ }
	40	+ localePromise.then(() => {
	41	+ this.amMoment.changeLocale(language);
	42	+ });
	43	+ }
30	44	}
...	...
...	...	@@ -2,7 +2,7 @@
2	2	<div class="container-fluid">
3	3	<div class="navbar-header">
4	4	<button type="button" class="navbar-toggle collapsed" ng-click="isCollapsed = !isCollapsed">
5		- <span class="sr-only">Toggle navigation</span>
	5	+ <span class="sr-only">{{"navbar.toggle_menu" \| translate}}</span>
6	6	<span class="icon-bar"></span>
7	7	<span class="icon-bar"></span>
8	8	<span class="icon-bar"></span>
...	...
...	...	@@ -77,6 +77,12 @@ describe("Components", () => {
77	77	}),
78	78	provide('tmhDynamicLocale', {
79	79	useValue: helpers.mocks.tmhDynamicLocale
	80	+ }),
	81	+ provide('amMoment', {
	82	+ useValue: helpers.mocks.amMoment
	83	+ }),
	84	+ provide('angularLoad', {
	85	+ useValue: helpers.mocks.angularLoad
80	86	})
81	87	].concat(helpers.provideFilters("translateFilter")),
82	88	directives: [Navbar],
...	...
...	...	@@ -5,7 +5,7 @@
5	5	<timeline-heading>
6	6	<h4 class="timeline-title">
7	7	<a ui-sref="main.profile.info({profile: ctrl.activity.user.identifier})"><strong ng-bind="ctrl.activity.user.name"></strong></a>
8		- <span> has made <span ng-bind="ctrl.activity.params.friend_name.length"></span> new friend(s): </span>
	8	+ <span> {{"activities.new_friendship.description" \| translate:{friends: ctrl.activity.params.friend_name.length} }} </span>
9	9	<span class="comma-separated">
10	10	<a class="separated-item" ui-sref="main.profile.info({profile: ctrl.activity.params.friend_url[$index].profile})" ng-repeat="friend in ctrl.activity.params.friend_name">
11	11	<strong ng-bind="friend"></strong>
...	...
...	...	@@ -5,12 +5,13 @@ describe("Filters", () => {
5	5	describe("Date Format Filter", () => {
6	6
7	7	beforeEach(angular.mock.module("templates"));
	8	+ beforeEach(angular.mock.module("angularMoment"));
8	9
9	10	it("convert date from the format returned by noosfero api to an ISO format", done => {
10	11	let date = "2016/03/10 10:46:47";
11	12	let htmlTemplate = `{{ '${date}' \| dateFormat }}`;
12	13	quickCreateComponent({ providers: [DateFormat], template: htmlTemplate }).then(fixture => {
13		- expect(fixture.debugElement.text()).toEqual('"2016-03-10T13:46:47.000Z"');
	14	+ expect(fixture.debugElement.text()).toEqual('2016-03-10T13:46:47.000Z');
14	15	done();
15	16	});
16	17	});
...	...
1	1	import {Pipe, Inject} from "ng-forward";
2	2
3	3	@Pipe("dateFormat")
	4	+@Inject("amParseFilter")
4	5	export class DateFormat {
5	6
	7	+ constructor(private amParseFilter: any) { }
	8	+
6	9	transform(date: string, options: any) {
7		- return moment(date, "YYYY/MM/DD HH:mm:ss");
	10	+ return this.amParseFilter(date, "YYYY/MM/DD HH:mm:ss").toISOString();
8	11	}
9	12
10	13	}
...	...