Project

General

Profile

Defect #43906 » wiki-help-fix-for-locales-with-region-subtag-v2.patch

Go MAEDA, 2026-03-30 10:40

View differences:

app/controllers/help_controller.rb
21 21
  def show_wiki_syntax
22 22
    type = params[:type].nil? ? "" : "#{params[:type]}_"
23 23

  
24
    lang = current_language.to_s
24
    lang = current_language.to_s.downcase
25 25
    template = "help/wiki_syntax/#{Setting.text_formatting}/#{lang}/wiki_syntax_#{type}#{Setting.text_formatting}"
26 26
    unless lookup_context.exists?(template)
27 27
      lang = "en"
test/functional/help_controller_test.rb
66 66
    assert_select 'h1', :text => "Wiki Syntax Schnellreferenz (CommonMark Markdown (GitHub Flavored))"
67 67
  end
68 68

  
69
  def test_get_help_wiki_syntax_should_use_lowercase_region_locale_directory
70
    user = User.find(2)
71
    user.language = 'ta-IN'
72
    user.save!
73
    @request.session[:user_id] = 2
74

  
75
    # The Tamil CommonMark help is stored under the lowercase ta-in directory, not ta-IN.
76
    with_settings :text_formatting => 'common_mark' do
77
      get :show_wiki_syntax
78
    end
79
    assert_response :success
80

  
81
    assert_select 'h1', :text => "விக்கி தொடரியல் விரைவு குறிப்பு (CommonMark Markdown (GitHub Flavored))"
82
  end
83

  
69 84
  def test_get_help_wiki_syntax_should_fallback_to_english
70 85
    user = User.find(2)
71 86
    user.language = 'ro'
72 87
    user.save!
73 88
    @request.session[:user_id] = 2
74 89

  
75
    get :show_wiki_syntax
90
    with_settings :text_formatting => 'common_mark' do
91
      get :show_wiki_syntax
92
    end
76 93
    assert_response :success
77 94

  
78 95
    assert_select 'h1', :text => "Wiki Syntax Quick Reference (CommonMark Markdown (GitHub Flavored))"
(2-2/2)