Commit 1722dc1a28282b4615d83dc25764badf61eee05a

Authored by Victor Costa
1 parent 1333ce21
Exists in master and in 1 other branch dev-fixes

Translate some activities

src/app/components/noosfero-activities/activities.component.spec.ts
@@ -19,7 +19,7 @@ describe("Components", () => { @@ -19,7 +19,7 @@ describe("Components", () => {
19 selector: 'test-container-component', 19 selector: 'test-container-component',
20 template: htmlTemplate, 20 template: htmlTemplate,
21 directives: [NoosferoActivities], 21 directives: [NoosferoActivities],
22 - providers: provideFilters("truncateFilter", "stripTagsFilter") 22 + providers: provideFilters("truncateFilter", "stripTagsFilter", "translateFilter")
23 }) 23 })
24 class BlockContainerComponent { 24 class BlockContainerComponent {
25 activities = [{ name: "activity1", verb: "create_article" }, { name: "activity2", verb: "create_article" }]; 25 activities = [{ name: "activity1", verb: "create_article" }, { name: "activity2", verb: "create_article" }];
src/app/components/noosfero-activities/activity/activity.component.spec.ts
@@ -19,7 +19,7 @@ describe("Components", () => { @@ -19,7 +19,7 @@ describe("Components", () => {
19 selector: 'test-container-component', 19 selector: 'test-container-component',
20 template: htmlTemplate, 20 template: htmlTemplate,
21 directives: [NoosferoActivity], 21 directives: [NoosferoActivity],
22 - providers: provideFilters("truncateFilter", "stripTagsFilter") 22 + providers: provideFilters("truncateFilter", "stripTagsFilter", "translateFilter")
23 }) 23 })
24 class BlockContainerComponent { 24 class BlockContainerComponent {
25 activity = { name: "activity1", verb: "create_article" }; 25 activity = { name: "activity1", verb: "create_article" };
src/app/components/noosfero-activities/activity/add_member_in_community.html
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <timeline-heading> 5 <timeline-heading>
6 <h4 class="timeline-title"> 6 <h4 class="timeline-title">
7 <a ui-sref="main.profile.info({profile: ctrl.activity.user.identifier})"><strong ng-bind="ctrl.activity.user.name"></strong></a> 7 <a ui-sref="main.profile.info({profile: ctrl.activity.user.identifier})"><strong ng-bind="ctrl.activity.user.name"></strong></a>
8 - <span> has joined the community</span> 8 + <span> {{"activities.add_member_in_community.description" | translate}}</span>
9 </h4> 9 </h4>
10 <p><small class="text-muted"><i class="fa fa-clock-o"></i> <span am-time-ago="ctrl.activity.created_at | dateFormat"></span></small></p> 10 <p><small class="text-muted"><i class="fa fa-clock-o"></i> <span am-time-ago="ctrl.activity.created_at | dateFormat"></span></small></p>
11 </timeline-heading> 11 </timeline-heading>
src/app/components/noosfero-activities/activity/create_article.html
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <timeline-heading> 5 <timeline-heading>
6 <h4 class="timeline-title"> 6 <h4 class="timeline-title">
7 <a ui-sref="main.profile.info({profile: ctrl.activity.user.identifier})"><strong ng-bind="ctrl.activity.user.name"></strong></a> 7 <a ui-sref="main.profile.info({profile: ctrl.activity.user.identifier})"><strong ng-bind="ctrl.activity.user.name"></strong></a>
8 - <span> has published on </span> 8 + <span> {{"activities.create_article.description" | translate}} </span>
9 <a ui-sref="main.profile.info({profile: ctrl.activity.target.article.profile.identifier})"> 9 <a ui-sref="main.profile.info({profile: ctrl.activity.target.article.profile.identifier})">
10 <strong ng-bind="ctrl.activity.target.article.profile.name"></strong></span> 10 <strong ng-bind="ctrl.activity.target.article.profile.name"></strong></span>
11 </a> 11 </a>
src/app/profile-info/profile-info.html
1 <h3>{{vm.profile.name}}</h3> 1 <h3>{{vm.profile.name}}</h3>
2 2
3 <div class="profile-wall"> 3 <div class="profile-wall">
4 - <h4>Profile Wall</h4> 4 + <h4>{{"profile.wall" | translate}}</h4>
5 <noosfero-activities [activities]="vm.activities"></noosfero-activities> 5 <noosfero-activities [activities]="vm.activities"></noosfero-activities>
6 </div> 6 </div>
src/languages/en.json
@@ -7,5 +7,8 @@ @@ -7,5 +7,8 @@
7 "navbar.login": "Login", 7 "navbar.login": "Login",
8 "language.en": "English", 8 "language.en": "English",
9 "language.pt": "Portuguese", 9 "language.pt": "Portuguese",
10 - "language.selector": "Language" 10 + "language.selector": "Language",
  11 + "profile.wall": "Profile Wall",
  12 + "activities.create_article.description": "has published on",
  13 + "activities.add_member_in_community.description": "has joined the community"
11 } 14 }
src/languages/pt.json
@@ -7,5 +7,8 @@ @@ -7,5 +7,8 @@
7 "navbar.login": "Login", 7 "navbar.login": "Login",
8 "language.en": "Inglês", 8 "language.en": "Inglês",
9 "language.pt": "Português", 9 "language.pt": "Português",
10 - "language.selector": "Idioma" 10 + "language.selector": "Idioma",
  11 + "profile.wall": "Mural do Perfil",
  12 + "activities.create_article.description": "publicou em",
  13 + "activities.add_member_in_community.description": "entrou na comunidade"
11 } 14 }