rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-17 06:52:27 +01:00
Code Issues Releases Activity

fix CAD files title translation in projects

Browse Source
This commit is contained in:
Sylvain 2016-03-30 09:46:20 +02:00
parent 5b35cf20ac
commit 305e887112
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/templates/plans/index.html.erb
View File

@ -88,18 +88,27 @@
<section class="widget panel b-a m m-t-lg" ng-show="ctrl.member">
<div class="panel-heading b-b">
<h3 ng-show="currentUser.role != 'admin'" translate>{{ 'my_group' }}</h3>
<h3 ng-show="currentUser.role === 'admin'">{{ 'his_group' | translate:{GENDER:getGender(currentUser)}:"messageformat" }}</h3>
<h3 ng-show="currentUser.role === 'admin'" translate translate-values="{GENDER:getGender(currentUser)}" translate-interpolation="messageformat">{{ 'his_group' }}</h3>
</div>
<div class="widget-content no-bg auto wrapper">
<div ng-show="!changeGroup">
<div class="well well-warning">
<strong>{{getUserGroup().name}}</strong>
</div>
<button class="btn btn-default m-t" ng-click="changeGroup = !changeGroup" ng-show="(!selectedPlan && ctrl.member && !ctrl.member.subscribed_plan && ctrl.member.subscription) || (!paidPlan)">{{ 'he_wants_to_change_group' | translate:{ROLE:currentUser.role}:"messageformat" }}</button>
<button class="btn btn-default m-t"
ng-click="changeGroup = !changeGroup"
ng-show="(!selectedPlan && ctrl.member && !ctrl.member.subscribed_plan && ctrl.member.subscription) || (!paidPlan)"
translate
translate-values="{ROLE:currentUser.role}"
translate-interpolation="messageformat">{{ 'he_wants_to_change_group' }}</button>
</div>
<div ng-show="changeGroup">
<select class="form-control" ng-options="g.id as g.name for g in groups" ng-model="userGroup"></select>
<button class="btn btn-success m-t" ng-click="selectGroup()" translate translate-values="{ROLE:currentUser.role, GENDER:getGender(currentUser)}" translate-interpolation="messageformat">{{ 'change_my_group' }}</button>
<button class="btn btn-success m-t"
ng-click="selectGroup()"
translate
translate-values="{ROLE:currentUser.role, GENDER:getGender(currentUser)}"
translate-interpolation="messageformat">{{ 'change_my_group' }}</button>
</div>
</div>
</section>

2
app/assets/templates/projects/show.html.erb
View File

@ -79,7 +79,7 @@
<section class="widget panel b-a m" ng-if="project.project_caos_attributes">
<div class="panel-heading b-b">
<span class="badge bg-warning pull-right">{{project.project_caos_attributes.length}}</span>
<h3>{{ 'CAD_file_to_download' | translate:{ COUNT: project.project_caos_attributes.length }:"messageformat" }}</h3>
<h3 translate translate-values="{COUNT:project.project_caos_attributes.length}" translate-interpolation="messageformat">{{ 'CAD_file_to_download' }}</h3>
</div>
<ul class="widget-content list-group list-group-lg no-bg auto">

2
config/locales/app.public.en.yml
View File

@ -134,7 +134,7 @@ en:
project_description: "Project description"
by_name: "By {{NAME}}" # angular interpolation
posted_on_: "Posted on"
CAD_file_to_download: "{COUNT, plural, =0{No CAD file} =1{CAD file to download} other{CAD files to download}" # messageFormat interpolation
CAD_file_to_download: "{COUNT, plural, =0{No CAD files} =1{CAD file to download} other{CAD files to download}}" # messageFormat interpolation
licence: "Licence"
report_an_abuse: "Report an abuse"
unauthorized_operation: "Unauthorized operation"