Skip to content

Commit

Permalink
Closes MarkUsProject#386. Add space between average and percentage sign.
Browse files Browse the repository at this point in the history
We'd like to have a space between % sign and the computed average for
the French locale. The English locale should not have this space. Now
the average is passed in as a parameter and the % sign is also in the
locale file.
  • Loading branch information
aimenk authored and lakeskysea committed Feb 6, 2012
1 parent 2b0f79c commit d9b90f5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
5 changes: 1 addition & 4 deletions app/views/main/_assignment_info_summary.html.erb
Expand Up @@ -7,10 +7,7 @@

<table>
<tr>
<td><%= I18n.t(:assignment_average) %></td>
<td>
<%= h("#{assignment.results_average || '0'}") %>%
</td>
<td><%= I18n.t(:assignment_average, :results_average => h(assignment.results_average || '0')) %></td>
</tr>

<tr>
Expand Down
3 changes: 2 additions & 1 deletion config/locales/en.yml
Expand Up @@ -1106,7 +1106,8 @@ en:
account_disabled: "This account has been disabled"

#app/views/main/_assignment_info_summary.erb
assignment_average: "Assignment Average:"

assignment_average: "Assignment Average: %{results_average}%"
assignments_submitted: "Assignments Submitted:"
assignments_graded: "Assignments Graded:"
refresh_graph: "Refresh the graph"
Expand Down
2 changes: 1 addition & 1 deletion config/locales/fr.yml
Expand Up @@ -1078,7 +1078,7 @@ fr:
account_disabled: "Ce compte a été désactivé"

#app/views/main/_assignment_info_summary.erb
assignment_average: "Moyenne :"
assignment_average: "Moyenne : %{results_average} %"
assignments_submitted: "Projets envoyés :"
assignments_graded: "Projets corrigés :"
refresh_graph: "Actualiser le graphique"
Expand Down

0 comments on commit d9b90f5

Please sign in to comment.