Download as
Browse Code »

Commit 8c7cced8e99f2bd24875ed3a3d631fa152f237e5

Authored by Antonio Terceiro
1 parent 347b2b36
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem978: ordering the languages

Showing 5 changed files with 36 additions and 31 deletions   Show diff stats
lib/noosfero.rb
  Diff comments   View file @8c7cced
@@ -15,6 +15,11 @@ module Noosfero @@ -15,6 +15,11 @@ module Noosfero
15 def available_locales 15 def available_locales
16 @available_locales ||= (Dir.glob(File.join(RAILS_ROOT, 'locale', '*')).map { |f| File.basename(f) }.select {|item| locales.include?(item) }) 16 @available_locales ||= (Dir.glob(File.join(RAILS_ROOT, 'locale', '*')).map { |f| File.basename(f) }.select {|item| locales.include?(item) })
17 end 17 end
  18 + def each_locale
  19 + locales.keys.sort.each do |key|
  20 + yield(key, locales[key])
  21 + end
  22 + end
18 end 23 end
19 24
20 def self.identifier_format 25 def self.identifier_format
public/500.html
  Diff comments   View file @8c7cced
@@ -17,24 +17,24 @@ @@ -17,24 +17,24 @@
17 </div> 17 </div>
18 18
19 19
20 - <div id='fr' style='display: none' class='message'>  
21 - <h1>Problème temporaire du système</h1> 20 + <div id='en' style='display: none' class='message'>
  21 + <h1>Temporary system problem</h1>
22 <p> 22 <p>
23 - Notre équipe technique y travaille, SVP réessayer plus tard. Désolé pour le dérangement. 23 + Our technical team is working on it, please try again later. Sorry for the inconvenience.
24 </p> 24 </p>
25 <ul> 25 <ul>
26 - <li><a href='javascript: history.back()'>Retour</a></li> 26 + <li><a href='javascript: history.back()'>Go back</a></li>
27 </ul> 27 </ul>
28 </div> 28 </div>
29 29
30 30
31 - <div id='pt_BR' style='display: none' class='message'>  
32 - <h1>Problema temporário no sistema</h1> 31 + <div id='fr' style='display: none' class='message'>
  32 + <h1>Problème temporaire du système</h1>
33 <p> 33 <p>
34 - Nossa equipe técnica está trabalhando nele, por favor tente mais tarde. Perdoe o incoveniente. 34 + Notre équipe technique y travaille, SVP réessayer plus tard. Désolé pour le dérangement.
35 </p> 35 </p>
36 <ul> 36 <ul>
37 - <li><a href='javascript: history.back()'>Voltar</a></li> 37 + <li><a href='javascript: history.back()'>Retour</a></li>
38 </ul> 38 </ul>
39 </div> 39 </div>
40 40
@@ -50,25 +50,25 @@ @@ -50,25 +50,25 @@
50 </div> 50 </div>
51 51
52 52
53 - <div id='en' style='display: none' class='message'>  
54 - <h1>Temporary system problem</h1> 53 + <div id='pt_BR' style='display: none' class='message'>
  54 + <h1>Problema temporário no sistema</h1>
55 <p> 55 <p>
56 - Our technical team is working on it, please try again later. Sorry for the inconvenience. 56 + Nossa equipe técnica está trabalhando nele, por favor tente mais tarde. Perdoe o incoveniente.
57 </p> 57 </p>
58 <ul> 58 <ul>
59 - <li><a href='javascript: history.back()'>Go back</a></li> 59 + <li><a href='javascript: history.back()'>Voltar</a></li>
60 </ul> 60 </ul>
61 </div> 61 </div>
62 62
63 <div id='languages'> 63 <div id='languages'>
64 64
65 - <a href="javascript: display_error_message('fr')">Français</a> 65 + <a href="javascript: display_error_message('en')">English</a>
66 66
67 - <a href="javascript: display_error_message('pt_BR')">Português</a> 67 + <a href="javascript: display_error_message('fr')">Français</a>
68 68
69 <a href="javascript: display_error_message('hy')">հայերեն լեզու</a> 69 <a href="javascript: display_error_message('hy')">հայերեն լեզու</a>
70 70
71 - <a href="javascript: display_error_message('en')">English</a> 71 + <a href="javascript: display_error_message('pt_BR')">Português</a>
72 72
73 </div> 73 </div>
74 </div> 74 </div>
public/500.html.erb
  Diff comments   View file @8c7cced
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 &nbsp; 19 &nbsp;
20 </div> 20 </div>
21 </div> 21 </div>
22 - <% Noosfero.locales.each do |language_code,language_name| %> 22 + <% Noosfero.each_locale do |language_code,language_name| %>
23 <% GetText.locale = language_code %> 23 <% GetText.locale = language_code %>
24 <div id='<%= language_code %>' style='display: none' class='message'> 24 <div id='<%= language_code %>' style='display: none' class='message'>
25 <h1><%= _('Temporary system problem') %></h1> 25 <h1><%= _('Temporary system problem') %></h1>
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 </div> 32 </div>
33 <% end %> 33 <% end %>
34 <div id='languages'> 34 <div id='languages'>
35 - <% Noosfero.locales.each do |language_code,language_name| %> 35 + <% Noosfero.each_locale do |language_code,language_name| %>
36 <a href="javascript: display_error_message('<%= language_code %>')"><%= language_name %></a> 36 <a href="javascript: display_error_message('<%= language_code %>')"><%= language_name %></a>
37 <% end %> 37 <% end %>
38 </div> 38 </div>
public/503.html
  Diff comments   View file @8c7cced
@@ -18,18 +18,18 @@ @@ -18,18 +18,18 @@
18 </div> 18 </div>
19 19
20 20
21 - <div id='fr' style='display: none' class='message'>  
22 - <h1>Maintenance Du Serveur</h1> 21 + <div id='en' style='display: none' class='message'>
  22 + <h1>System maintainance</h1>
23 <p> 23 <p>
24 - Cette plate-forme web est en maintenance. Elle sera à nouveau opérationnelle dans quelques heures. 24 + This system is under maintainance. It should be back in a few hours.
25 </p> 25 </p>
26 </div> 26 </div>
27 27
28 28
29 - <div id='pt_BR' style='display: none' class='message'>  
30 - <h1>Manutenção do sistema</h1> 29 + <div id='fr' style='display: none' class='message'>
  30 + <h1>Maintenance Du Serveur</h1>
31 <p> 31 <p>
32 - Este sistema está em manutenção. Ele deve estar de volta em algumas horas. 32 + Cette plate-forme web est en maintenance. Elle sera à nouveau opérationnelle dans quelques heures.
33 </p> 33 </p>
34 </div> 34 </div>
35 35
@@ -42,22 +42,22 @@ @@ -42,22 +42,22 @@
42 </div> 42 </div>
43 43
44 44
45 - <div id='en' style='display: none' class='message'>  
46 - <h1>System maintainance</h1> 45 + <div id='pt_BR' style='display: none' class='message'>
  46 + <h1>Manutenção do sistema</h1>
47 <p> 47 <p>
48 - This system is under maintainance. It should be back in a few hours. 48 + Este sistema está em manutenção. Ele deve estar de volta em algumas horas.
49 </p> 49 </p>
50 </div> 50 </div>
51 51
52 <div id='languages'> 52 <div id='languages'>
53 53
54 - <a href="javascript: display_error_message('fr')">Français</a> 54 + <a href="javascript: display_error_message('en')">English</a>
55 55
56 - <a href="javascript: display_error_message('pt_BR')">Português</a> 56 + <a href="javascript: display_error_message('fr')">Français</a>
57 57
58 <a href="javascript: display_error_message('hy')">հայերեն լեզու</a> 58 <a href="javascript: display_error_message('hy')">հայերեն լեզու</a>
59 59
60 - <a href="javascript: display_error_message('en')">English</a> 60 + <a href="javascript: display_error_message('pt_BR')">Português</a>
61 61
62 </div> 62 </div>
63 </div> 63 </div>
public/503.html.erb
  Diff comments   View file @8c7cced
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 &nbsp; 20 &nbsp;
21 </div> 21 </div>
22 </div> 22 </div>
23 - <% Noosfero.locales.each do |language_code,language_name| %> 23 + <% Noosfero.each_locale do |language_code,language_name| %>
24 <% GetText.locale = language_code %> 24 <% GetText.locale = language_code %>
25 <div id='<%= language_code %>' style='display: none' class='message'> 25 <div id='<%= language_code %>' style='display: none' class='message'>
26 <h1><%= _('System maintainance') %></h1> 26 <h1><%= _('System maintainance') %></h1>
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 </div> 30 </div>
31 <% end %> 31 <% end %>
32 <div id='languages'> 32 <div id='languages'>
33 - <% Noosfero.locales.each do |language_code,language_name| %> 33 + <% Noosfero.each_locale do |language_code,language_name| %>
34 <a href="javascript: display_error_message('<%= language_code %>')"><%= language_name %></a> 34 <a href="javascript: display_error_message('<%= language_code %>')"><%= language_name %></a>
35 <% end %> 35 <% end %>
36 </div> 36 </div>