Merge pull request #190 from opf/feature/rails3_drop_translations_we_cannot_support_at_the_moment

Feature/rails3 drop translations we cannot support at the moment

features/custom_fields/create_text.feature

@@ -16,7 +16,6 @@ Feature: Text custom fields can be created
     And the following languages are active:
       | en |
       | de |
-      | fr |
     When I go to the custom fields page
     When I follow "New custom field" within "#tab-content-IssueCustomField"
 
@@ -25,17 +24,14 @@ Feature: Text custom fields can be created
     When I select "Text" from "custom_field_field_format"
     And I set the english localization of the "name" attribute to "New Field"
     And I add the german localization of the "name" attribute as "Neues Feld"
-    And I add the french localization of the "name" attribute as "Lorem ipsum"
     And I set the english localization of the "default_value" attribute to "default"
     And I add the german localization of the "default_value" attribute as "Standard"
-    And I add the french localization of the "default_value" attribute as "Lorem"
     And I press "Save"
     And I follow "New Field"
     Then there should be the following localizations:
       | locale  | name          | default_value  |
       | en      | New Field     | default        |
       | de      | Neues Feld    | Standard       |
-      | fr      | Lorem ipsum   | Lorem          |
 
   Scenario: Creating a custom field with one name
     And I set the english localization of the "name" attribute to "Issue Field"

features/custom_fields/edit_bool.feature

@@ -16,7 +16,6 @@ Feature: Editing a bool custom field
     And the following languages are active:
       | en |
       | de |
-      | fr |
     And the following issue custom fields are defined:
       | name              | type      |
       | IssueCustomField  | bool      |
@@ -27,7 +26,6 @@ Feature: Editing a bool custom field
     When I follow "IssueCustomField"
     And I set the english localization of the "name" attribute to "Issue Field"
     And I add the german localization of the "name" attribute as "Ticket Feld"
-    And I add the french localization of the "name" attribute as "Lorem"
     And I press "Save"
     Then I should be on the custom fields page
     When I follow "Issue Field"
@@ -35,7 +33,6 @@ Feature: Editing a bool custom field
       | locale  | name        | default_value |
       | en      | Issue Field | 0             |
       | de      | Ticket Feld | nil           |
-      | fr      | Lorem       | nil           |
     And I should not see "Add" within "#custom_field_name_attributes"
 
   Scenario: Entering a long name displays an error

features/custom_fields/edit_bool_delete_localizations.feature

@@ -16,7 +16,6 @@ Feature: Name localizations of bool custom fields can be deleted
     And the following languages are active:
       | en |
       | de |
-      | fr |
     And the following issue custom fields are defined:
       | name             | type      |
       | My Custom Field  | bool      |
@@ -62,14 +61,16 @@ Feature: Name localizations of bool custom fields can be deleted
   @javascript
   Scenario: Deleting a newly added localization
     When I follow "My Custom Field"
-    And I add the french localization of the "name" attribute as "To delete"
-    And I delete the french localization of the "name" attribute
+    And I delete the german localization of the "name" attribute
+    And I press "Save"
+    And I follow "My Custom Field"
+    And I add the german localization of the "name" attribute as "To delete"
+    And I delete the german localization of the "name" attribute
     And I press "Save"
     And I follow "My Custom Field"
     Then there should be the following localizations:
       | locale | name                          | default_value |
       | en     | My Custom Field               | 0             |
-      | de     | Mein Benutzerdefiniertes Feld | nil           |
 
   @javascript
   Scenario: Deletion link is hidden when only one localization exists

test/functional/admin_controller_test.rb

@@ -60,12 +60,12 @@ class AdminControllerTest < ActionController::TestCase
   end
 
   def test_load_default_configuration_data
-    Setting.available_languages = [:fr]
+    Setting.available_languages = [:de]
     delete_configuration_data
-    post :default_configuration, :lang => 'fr'
+    post :default_configuration, :lang => 'de'
     assert_response :redirect
     assert_nil flash[:error]
-    assert IssueStatus.find_by_name('Nouveau')
+    assert IssueStatus.find_by_name('Neu')
   end
 
   def test_test_email

test/functional/user_mailer_test.rb

@@ -327,16 +327,16 @@ class UserMailerTest < ActionMailer::TestCase
       issue = FactoryGirl.create(:issue)
       user  = FactoryGirl.create(:user, :mail => 'foo@bar.de', :language => '') # (auto)
       ActionMailer::Base.deliveries.clear
-      with_settings :available_languages => ['en', 'de', 'fr'],
+      with_settings :available_languages => ['en', 'de'],
                     :default_language => 'de' do
-        I18n.locale = 'fr'
+        I18n.locale = 'de'
         assert UserMailer.issue_added(user, issue).deliver
         assert_equal 1, ActionMailer::Base.deliveries.size
         mail = last_email
         assert_equal ['foo@bar.de'], mail.to
         assert !mail.body.encoded.include?('reported')
         assert mail.body.encoded.include?('erstellt')
-        assert_equal :fr, I18n.locale
+        assert_equal :de, I18n.locale
       end
     end
   end
@@ -466,16 +466,16 @@ class UserMailerTest < ActionMailer::TestCase
   end
 
   def test_mailer_should_not_change_locale
-    with_settings :available_languages => ['en', 'it', 'fr'],
+    with_settings :available_languages => ['en', 'de'],
                   :default_language    => 'en' do
-      # Set current language to italian
-      I18n.locale = :it
-      # Send an email to a french user
-      user = FactoryGirl.create(:user, :language => 'fr')
+      # Set current language to english
+      I18n.locale = :en
+      # Send an email to a german user
+      user = FactoryGirl.create(:user, :language => 'de')
       UserMailer.account_activated(user).deliver
       mail = ActionMailer::Base.deliveries.last
-      assert mail.body.encoded.include?('Votre compte')
-      assert_equal :it, I18n.locale
+      assert mail.body.encoded.include?('aktiviert')
+      assert_equal :en, I18n.locale
     end
   end
 

test/functional/welcome_controller_test.rb

@@ -23,7 +23,7 @@ class WelcomeControllerTest < ActionController::TestCase
     @controller = WelcomeController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    Setting.available_languages = [:en, :fr, :"zh-TW"]
+    Setting.available_languages = [:en, :de]
     User.current = nil
   end
 
@@ -38,23 +38,23 @@ class WelcomeControllerTest < ActionController::TestCase
 
   def test_browser_language
     Setting.default_language = 'en'
-    @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
+    @request.env['HTTP_ACCEPT_LANGUAGE'] = 'de,de-de;q=0.8,en-us;q=0.5,en;q=0.3'
     get :index
-    assert_equal :fr, @controller.current_language
+    assert_equal :de, @controller.current_language
   end
 
   def test_browser_language_alternate
     Setting.default_language = 'en'
-    @request.env['HTTP_ACCEPT_LANGUAGE'] = 'zh-TW'
+    @request.env['HTTP_ACCEPT_LANGUAGE'] = 'de'
     get :index
-    assert_equal :"zh-TW", @controller.current_language
+    assert_equal :"de", @controller.current_language
   end
 
   def test_browser_language_alternate_not_valid
     Setting.default_language = 'en'
-    @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr-CA'
+    @request.env['HTTP_ACCEPT_LANGUAGE'] = 'de-CA'
     get :index
-    assert_equal :fr, @controller.current_language
+    assert_equal :de, @controller.current_language
   end
 
   def test_robots

test/integration/application_test.rb

@@ -17,20 +17,14 @@ class ApplicationTest < ActionDispatch::IntegrationTest
   fixtures :all
 
   def test_set_localization
-    Setting.available_languages = [:fr, :en, :it]
+    Setting.available_languages = [:de, :en]
     Setting.default_language = 'en'
 
     # a french user
-    get 'projects', { }, { 'HTTP_ACCEPT_LANGUAGE' => 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'}
+    get 'projects', { }, { 'HTTP_ACCEPT_LANGUAGE' => 'de,de-de;q=0.8,en-us;q=0.5,en;q=0.3'}
     assert_response :success
-    assert_tag :tag => 'h2', :content => 'Projets'
-    assert_equal :fr, current_language
-
-    # then an italien user
-    get 'projects', { }, 'HTTP_ACCEPT_LANGUAGE' => 'it;q=0.8,en-us;q=0.5,en;q=0.3'
-    assert_response :success
-    assert_tag :tag => 'h2', :content => 'Progetti'
-    assert_equal :it, current_language
+    assert_tag :tag => 'h2', :content => 'Projekte'
+    assert_equal :de, current_language
 
     # not a supported language: default language should be used
     get 'projects', { }, 'HTTP_ACCEPT_LANGUAGE' => 'zz'

test/unit/lib/redmine/helpers/calendar_test.rb

@@ -14,11 +14,11 @@ require File.expand_path('../../../../../test_helper', __FILE__)
 class CalendarTest < ActiveSupport::TestCase
 
   def test_monthly
-    Setting.available_languages = [:fr, :en]
-    c = Redmine::Helpers::Calendar.new(Date.today, :fr, :month)
+    Setting.available_languages = [:de, :en]
+    c = Redmine::Helpers::Calendar.new(Date.today, :de, :month)
     assert_equal [1, 7], [c.startdt.cwday, c.enddt.cwday]
 
-    c = Redmine::Helpers::Calendar.new('2007-07-14'.to_date, :fr, :month)
+    c = Redmine::Helpers::Calendar.new('2007-07-14'.to_date, :de, :month)
     assert_equal ['2007-06-25'.to_date, '2007-08-05'.to_date], [c.startdt, c.enddt]
 
     c = Redmine::Helpers::Calendar.new(Date.today, :en, :month)
@@ -26,11 +26,11 @@ class CalendarTest < ActiveSupport::TestCase
   end
 
   def test_weekly
-    Setting.available_languages = [:fr, :en]
-    c = Redmine::Helpers::Calendar.new(Date.today, :fr, :week)
+    Setting.available_languages = [:de, :en]
+    c = Redmine::Helpers::Calendar.new(Date.today, :de, :week)
     assert_equal [1, 7], [c.startdt.cwday, c.enddt.cwday]
 
-    c = Redmine::Helpers::Calendar.new('2007-07-14'.to_date, :fr, :week)
+    c = Redmine::Helpers::Calendar.new('2007-07-14'.to_date, :de, :week)
     assert_equal ['2007-07-09'.to_date, '2007-07-15'.to_date], [c.startdt, c.enddt]
 
     c = Redmine::Helpers::Calendar.new(Date.today, :en, :week)

test/unit/lib/redmine/i18n_test.rb

@@ -118,14 +118,13 @@ class Redmine::I18nTest < ActiveSupport::TestCase
   end
 
   def test_valid_language
-    Setting.available_languages = [:fr, :zh, :"zh-TW"]
+    Setting.available_languages = [:de, :zh]
 
-    to_test = {'fr' => :fr,
-               'Fr' => :fr,
-               'zh' => :zh,
-               'zh-tw' => :"zh-TW",
-               'zh-TW' => :"zh-TW",
-               'zh-ZZ' => nil }
+    to_test = {'de' => :de,
+               'DE' => :de,
+               'De' => :de,
+               'de-ZZ' => nil,
+               'zh' => nil }
 
     to_test.each {|lang, expected| assert_equal expected, find_language(lang)}
   end
@@ -134,13 +133,13 @@ class Redmine::I18nTest < ActiveSupport::TestCase
     ::I18n.backend.store_translations(:en, {:untranslated => "Untranslated string"})
     ::I18n.locale = 'en'
     assert_equal "Untranslated string", l(:untranslated)
-    ::I18n.locale = 'fr'
+    ::I18n.locale = 'de'
     assert_equal "Untranslated string", l(:untranslated)
 
-    ::I18n.backend.store_translations(:fr, {:untranslated => "Pas de traduction"})
+    ::I18n.backend.store_translations(:de, {:untranslated => "Keine Übersetzung"})
     ::I18n.locale = 'en'
     assert_equal "Untranslated string", l(:untranslated)
-    ::I18n.locale = 'fr'
-    assert_equal "Pas de traduction", l(:untranslated)
+    ::I18n.locale = 'de'
+    assert_equal "Keine Übersetzung", l(:untranslated)
   end
 end