Changed the length of 'language' column in users table from 2 to 5, to allow…

Changed the length of 'language' column in users table from 2 to 5, to allow long language codes like pt-br. Updated portuguese translation (Arthur Zapparoli). Current pt translation moved to pt-br. git-svn-id: http://redmine.rubyforge.org/svn/trunk@518 e93f8b46-1217-0410-a6f0-8f06a7374b81

Changed the length of 'language' column in users table from 2 to 5, to allow…
Changed the length of 'language' column in users table from 2 to 5, to allow long language codes like pt-br. Updated portuguese translation (Arthur Zapparoli). Current pt translation moved to pt-br. git-svn-id: http://redmine.rubyforge.org/svn/trunk@518 e93f8b46-1217-0410-a6f0-8f06a7374b81
5c88c1f5 · Jean-Philippe Lang · d85f5518 · 5c88c1f5 · 5c88c1f5 · 5c88c1f5
Commit 5c88c1f5 authored May 08, 2007 by Jean-Philippe Lang
27 changed files
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -191,7 +191,7 @@ module ApplicationHelper
  
  def lang_options_for_select(blank=true)
    (blank ? [["(auto)", ""]] : []) + 
-      (GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }).collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
+      GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.first <=> y.first }
  end
  
  def label_tag_for(name, option_tags = nil, options = {})

--- a/app/views/mailer/attachments_add_pt-br.rhtml
+++ b/app/views/mailer/attachments_add_pt-br.rhtml
+<%= @added_to %>
+<%= @attachments.size %> arquivo(s) adicionado.
+<% @attachments.each do |attachment | %>
+- <%= attachment.filename %><% end %>
+
+<%= @url %>
\ No newline at end of file
--- a/app/views/mailer/attachments_add_pt.rhtml
+++ b/app/views/mailer/attachments_add_pt.rhtml
 <%= @added_to %>
-<%= @attachments.size %> files(s) added.
+<%= @attachments.size %> arquivo(s) adicionado.
 <% @attachments.each do |attachment | %>
 - <%= attachment.filename %><% end %>


--- a/app/views/mailer/document_add_pt-br.rhtml
+++ b/app/views/mailer/document_add_pt-br.rhtml
+Um documento foi adicionado no projeto <%= @document.project.name %> (<%= @document.category.name %>):
+<%= l(:field_title) %>: <%= @document.title %>
+
+http://<%= Setting.host_name %>/documents/show/<%= @document.id %>
\ No newline at end of file
--- a/app/views/mailer/document_add_pt.rhtml
+++ b/app/views/mailer/document_add_pt.rhtml
-A document has been added to <%= @document.project.name %> (<%= @document.category.name %>):
+Um documento foi adicionado no projeto <%= @document.project.name %> (<%= @document.category.name %>):
 <%= l(:field_title) %>: <%= @document.title %>

 http://<%= Setting.host_name %>/documents/show/<%= @document.id %>
\ No newline at end of file
--- a/app/views/mailer/issue_add_pt-br.rhtml
+++ b/app/views/mailer/issue_add_pt-br.rhtml
+Tarefa #<%= @issue.id %> foi incluída.
+----------------------------------------
+<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
\ No newline at end of file
--- a/app/views/mailer/issue_add_pt.rhtml
+++ b/app/views/mailer/issue_add_pt.rhtml
-Issue #<%= @issue.id %> has been reported.
+Tarefa #<%= @issue.id %> foi incluída.
 ----------------------------------------
 <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
\ No newline at end of file
--- a/app/views/mailer/issue_edit_pt-br.rhtml
+++ b/app/views/mailer/issue_edit_pt-br.rhtml
+Tarefa #<%= @issue.id %> foi alterada.
+<%= @journal.user.name %>
+<% for detail in @journal.details %>
+<%= show_detail(detail, true) %>
+<% end %>
+<%= @journal.notes if @journal.notes? %>
+----------------------------------------
+<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
\ No newline at end of file
--- a/app/views/mailer/issue_edit_pt.rhtml
+++ b/app/views/mailer/issue_edit_pt.rhtml
-Issue #<%= @issue.id %> has been updated.
+Tarefa #<%= @issue.id %> foi alterada.
 <%= @journal.user.name %>
 <% for detail in @journal.details %>
 <%= show_detail(detail, true) %>

--- a/app/views/mailer/lost_password_pt-br.rhtml
+++ b/app/views/mailer/lost_password_pt-br.rhtml
+Para mudar sua senha, clique no link abaixo:
+
+http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %>
\ No newline at end of file
--- a/app/views/mailer/lost_password_pt.rhtml
+++ b/app/views/mailer/lost_password_pt.rhtml
-To change your password, use the following link:
+Para mudar sua senha, clique no link abaixo:

 http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %>
\ No newline at end of file
--- a/app/views/mailer/register_pt-br.rhtml
+++ b/app/views/mailer/register_pt-br.rhtml
+Para ativar sua conta do redMine, clique no link abaixo:
+
+http://<%= Setting.host_name %>/account/register?token=<%= @token.value %>
\ No newline at end of file
--- a/app/views/mailer/register_pt.rhtml
+++ b/app/views/mailer/register_pt.rhtml
-To activate your redMine account, use the following link:
+Para ativar sua conta do redMine, clique no link abaixo:

 http://<%= Setting.host_name %>/account/register?token=<%= @token.value %>
\ No newline at end of file
--- a/db/migrate/044_set_language_length_to_five.rb
+++ b/db/migrate/044_set_language_length_to_five.rb
+class SetLanguageLengthToFive < ActiveRecord::Migration
+  def self.up
+    change_column :users, :language, :string, :limit => 5, :default => ""
+  end
+
+  def self.down
+    raise IrreversibleMigration
+  end
+end
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -46,7 +46,7 @@ general_text_No: 'Не'
 general_text_Yes: 'Да'
 general_text_no: 'не'
 general_text_yes: 'да'
-general_lang_bg: 'Bulgarian'
+general_lang_name: 'Bulgarian'
 general_csv_separator: ','
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1

--- a/lang/de.yml
+++ b/lang/de.yml
@@ -46,7 +46,7 @@ general_text_No: 'Nein'
 general_text_Yes: 'Ja'
 general_text_no: 'nein'
 general_text_yes: 'ja'
-general_lang_de: 'Deutsch'
+general_lang_name: 'Deutsch'
 general_csv_separator: ';'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1

--- a/lang/en.yml
+++ b/lang/en.yml
@@ -46,7 +46,7 @@ general_text_No: 'No'
 general_text_Yes: 'Yes'
 general_text_no: 'no'
 general_text_yes: 'yes'
-general_lang_en: 'English'
+general_lang_name: 'English'
 general_csv_separator: ','
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1

--- a/lang/es.yml
+++ b/lang/es.yml
@@ -46,7 +46,7 @@ general_text_No: 'No'
 general_text_Yes: 'Sí'
 general_text_no: 'no'
 general_text_yes: 'sí'
-general_lang_es: 'Español'
+general_lang_name: 'Español'
 general_csv_separator: ';'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1

--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -46,7 +46,7 @@ general_text_No: 'Non'
 general_text_Yes: 'Oui'
 general_text_no: 'non'
 general_text_yes: 'oui'
-general_lang_fr: 'Français'
+general_lang_name: 'Français'
 general_csv_separator: ';'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1

--- a/lang/it.yml
+++ b/lang/it.yml
@@ -46,7 +46,7 @@ general_text_No: 'No'
 general_text_Yes: 'Si'
 general_text_no: 'no'
 general_text_yes: 'si'
-general_lang_it: 'Italiano'
+general_lang_name: 'Italiano'
 general_csv_separator: ','
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1

--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -47,7 +47,7 @@ general_text_No: 'いいえ'
 general_text_Yes: 'はい'
 general_text_no: 'いいえ'
 general_text_yes: 'はい'
-general_lang_ja: 'Japanese (日本語)'
+general_lang_name: 'Japanese (日本語)'
 general_csv_separator: ','
 general_csv_encoding: SJIS
 general_pdf_encoding: SJIS

--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
--- a/lang/pt.yml
+++ b/lang/pt.yml
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -49,7 +49,7 @@ general_text_No: '否'
 general_text_Yes: '是'
 general_text_no: '否'
 general_text_yes: '是'
-general_lang_zh: 'Chinese (简体中文)'
+general_lang_name: 'Chinese (简体中文)'
 general_csv_separator: ','
 general_csv_encoding: gb2312
 general_pdf_encoding: Big5

--- a/public/javascripts/calendar/lang/calendar-pt-br.js
+++ b/public/javascripts/calendar/lang/calendar-pt-br.js
+// ** I18N
+
+// Calendar pt_BR language
+// Author: Adalberto Machado, <betosm@terra.com.br>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Domingo",
+ "Segunda",
+ "Terca",
+ "Quarta",
+ "Quinta",
+ "Sexta",
+ "Sabado",
+ "Domingo");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Dom",
+ "Seg",
+ "Ter",
+ "Qua",
+ "Qui",
+ "Sex",
+ "Sab",
+ "Dom");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("Janeiro",
+ "Fevereiro",
+ "Marco",
+ "Abril",
+ "Maio",
+ "Junho",
+ "Julho",
+ "Agosto",
+ "Setembro",
+ "Outubro",
+ "Novembro",
+ "Dezembro");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Fev",
+ "Mar",
+ "Abr",
+ "Mai",
+ "Jun",
+ "Jul",
+ "Ago",
+ "Set",
+ "Out",
+ "Nov",
+ "Dez");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Sobre o calendario";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Ultima versao visite: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuido sobre GNU LGPL.  Veja http://gnu.org/licenses/lgpl.html para detalhes." +
+"\n\n" +
+"Selecao de data:\n" +
+"- Use os botoes \xab, \xbb para selecionar o ano\n" +
+"- Use os botoes " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " para selecionar o mes\n" +
+"- Segure o botao do mouse em qualquer um desses botoes para selecao rapida.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selecao de hora:\n" +
+"- Clique em qualquer parte da hora para incrementar\n" +
+"- ou Shift-click para decrementar\n" +
+"- ou clique e segure para selecao rapida.";
+
+Calendar._TT["PREV_YEAR"] = "Ant. ano (segure para menu)";
+Calendar._TT["PREV_MONTH"] = "Ant. mes (segure para menu)";
+Calendar._TT["GO_TODAY"] = "Hoje";
+Calendar._TT["NEXT_MONTH"] = "Prox. mes (segure para menu)";
+Calendar._TT["NEXT_YEAR"] = "Prox. ano (segure para menu)";
+Calendar._TT["SEL_DATE"] = "Selecione a data";
+Calendar._TT["DRAG_TO_MOVE"] = "Arraste para mover";
+Calendar._TT["PART_TODAY"] = " (hoje)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Mostre %s primeiro";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Fechar";
+Calendar._TT["TODAY"] = "Hoje";
+Calendar._TT["TIME_PART"] = "(Shift-)Click ou arraste para mudar valor";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d/%m/%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %e %b";
+
+Calendar._TT["WK"] = "sm";
+Calendar._TT["TIME"] = "Hora:";
--- a/public/javascripts/calendar/lang/calendar-pt.js
+++ b/public/javascripts/calendar/lang/calendar-pt.js
@@ -42,10 +42,10 @@ Calendar._SDN = new Array
 "Sex",
 "Sab",
 "Dom");
-
-// First day of the week. "0" means display Sunday first, "1" means display
-// Monday first, etc.
-Calendar._FD = 1;
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;

 // full month names
 Calendar._MN = new Array

--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -30,7 +30,7 @@ class ApplicationControllerTest < Test::Unit::TestCase

  # check that all 6 supported languages are valid
  def test_localization
-    assert_equal 9, GLoc.valid_languages.size
+    assert_equal 10, GLoc.valid_languages.size
    GLoc.valid_languages.each do |lang|
      assert set_language_if_valid(lang)
    end