Typo "expended" changed to "expanded"

Fixes #29

Signed-off-by: Daniel Kastl <[email protected]>

Author: dkastl

app/views/issues/_form_custom_fields.html.erb

@@ -4,7 +4,7 @@
 <% end %>
 <% fieldset_default_state = User.current.pref.fieldset_default_state %>
 <% if fieldset_default_state.blank? %>
-  <% fieldset_default_state = Setting.plugin_redmine_custom_fields_groups['fieldset_default_state'] || 'all_expended' %>
+  <% fieldset_default_state = Setting.plugin_redmine_custom_fields_groups['fieldset_default_state'] || 'all_expanded' %>
 <% end %>
 <% all_collapsed = (fieldset_default_state == 'all_collapsed') %>
 <% grouped_custom_field_values(@issue.editable_custom_field_values).each do |title, values| %>
@@ -35,7 +35,7 @@
         <% end %>
       <% else %>
         <% fieldset_class = 'collapsible custom-fields-groups' + (all_collapsed ? ' collapsed' : '') %>
-        <% legend_class = 'icon icon-' + (all_collapsed ? 'collapsed' : ((Redmine::VERSION.to_s >= '5.0.0') ? 'expanded' : 'expended')) %>
+        <% legend_class = 'icon icon-' + (all_collapsed ? 'collapsed' : ((Redmine::VERSION.to_s >= '5.0.0') ? 'expanded' : 'expanded')) %>
         <% div_style = all_collapsed ? 'display: none' : '' %>
         <fieldset class="<%= fieldset_class %>">
           <%= content_tag('legend', title, :onclick => "toggleFieldset(this);", :class => legend_class) %>

config/locales/en.yml

@@ -9,6 +9,6 @@ en:
   label_group_tag_h4: H4
   label_group_tag_fieldset: Fieldset
   label_fieldset_default_state: Fieldset Default State
-  label_fieldset_state_all_expended: All expended
+  label_fieldset_state_all_expanded: All expanded
   label_fieldset_state_all_collapsed: All collapsed
   error_can_not_delete_custom_fields_group: Unable to delete custom fields group

config/locales/ja.yml

@@ -9,6 +9,6 @@ ja:
   label_group_tag_h4: H4
   label_group_tag_fieldset: フィールドセット
   label_fieldset_default_state: フィールドセットのデフォルト状態
-  label_fieldset_state_all_expended: 全て展開
+  label_fieldset_state_all_expanded: 全て展開
   label_fieldset_state_all_collapsed: 全て折りたたみ
   error_can_not_delete_custom_fields_group: カスタムフィールドグループを削除できません。

init.rb

@@ -14,7 +14,7 @@
   settings partial: 'settings/redmine_custom_fields_groups',
     default: {
       'custom_fields_group_tag' => 'h4',
-      'fieldset_default_state' => 'all_expended'
+      'fieldset_default_state' => 'all_expanded'
     }
 
   menu :admin_menu,

lib/redmine_custom_fields_groups/options.rb

@@ -10,7 +10,7 @@ def self.group_tags
     end
     def self.fieldset_states
       [
-        [l(:label_fieldset_state_all_expended), "all_expended"],
+        [l(:label_fieldset_state_all_expanded), "all_expanded"],
         [l(:label_fieldset_state_all_collapsed), "all_collapsed"],
       ]
     end

lib/redmine_custom_fields_groups/patches/issues_helper_patch.rb

@@ -33,7 +33,7 @@ def render_custom_fields_rows_by_groups(issue)
             end
             fieldset_default_state = User.current.pref.fieldset_default_state
             if fieldset_default_state.blank?
-              fieldset_default_state = Setting.plugin_redmine_custom_fields_groups['fieldset_default_state'] || 'all_expended'
+              fieldset_default_state = Setting.plugin_redmine_custom_fields_groups['fieldset_default_state'] || 'all_expanded'
             end
 
             s = ''.html_safe
@@ -46,7 +46,7 @@ def render_custom_fields_rows_by_groups(issue)
                   else
                     s << content_tag('fieldset', :class => 'collapsible custom-fields-groups') do
                       concat content_tag('legend', title, :onclick => 'toggleFieldset(this);',
-                        :class => 'icon icon-' + ((Redmine::VERSION.to_s >= '5.0.0') ? 'expanded' : 'expended'))
+                        :class => 'icon icon-' + ((Redmine::VERSION.to_s >= '5.0.0') ? 'expanded' : 'expanded'))
                       concat render_half_width_custom_fields_rows_by_grouped_values(issue, values)
                       concat render_full_width_custom_fields_rows_by_grouped_values(issue, values)
                     end

test/integration/layout_test.rb

@@ -130,10 +130,10 @@ class LayoutTest < Redmine::IntegrationTest
     end
   end
 
-  test 'should show custom fields groups with fieldset tag all expended in issue from plugin setting' do
+  test 'should show custom fields groups with fieldset tag all expanded in issue from plugin setting' do
     Setting.plugin_redmine_custom_fields_groups = {
       'custom_fields_group_tag' => 'fieldset',
-      'fieldset_default_state' => 'all_expended'
+      'fieldset_default_state' => 'all_expanded'
     }
 
     log_user('dlopper', 'foo')
@@ -196,7 +196,7 @@ class LayoutTest < Redmine::IntegrationTest
     }
 
     @user.pref.others[:custom_fields_group_tag] = 'fieldset'
-    @user.pref.others[:fieldset_default_state] = 'all_expended'
+    @user.pref.others[:fieldset_default_state] = 'all_expanded'
     @user.pref.save!
 
     log_user('dlopper', 'foo')

test/system/fieldset_test.rb

@@ -13,10 +13,10 @@ class FieldsetTest < ApplicationSystemTestCase
     Setting.clear_cache
   end
 
-  test 'click group title should collapse/expand fieldset with default state all_expended' do
+  test 'click group title should collapse/expand fieldset with default state all_expanded' do
     Setting.plugin_redmine_custom_fields_groups = {
       'custom_fields_group_tag' => 'fieldset',
-      'fieldset_default_state' => 'all_expended'
+      'fieldset_default_state' => 'all_expanded'
     }
 
     log_user('dlopper', 'foo')