Merge pull request #69 from farend/change-icons-to-svg

Change icons to svg

Author: ishikawa999

.github/workflows/test.yml

@@ -11,9 +11,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - redmine-repository: 'redmica/redmica'
-            redmine-version: 'stable-3.0'
-            ruby-version: '3.3'
           - redmine-repository: 'redmica/redmica'
             redmine-version: 'master'
             ruby-version: '3.3'

README.md

@@ -1,21 +1,17 @@
 # redmine_message_customize
 
 This is a plugin for Redmine.  
-This plugin changes the translation of the wording on the screen defined in "config/locales/*.yml" in the admin view.
+This plugin changes the translation of the wording on the screen defined in "config/locales/*.yml" in the admin view.  
+It is available for Redmine 6.0 or later.
 
 ## Install
 
 ```
 $ cd /your/path/redmine
 $ git clone https://github.com/farend/redmine_message_customize.git plugins/redmine_message_customize
-$ # When Redmine 4.1 or lower versions
-$ cp plugins/redmine_message_customize/35_change_load_order_locales.rb config/initializers/35_change_load_order_locales.rb
 $ # redmine restart
 ```
 
-:warning: To customize messages for other plugins in **Redmine 4.1 or lower versions**, redmine_message_customize/35_change_load_order_locales.rb It is necessary to copy the file to redmine/config/initializers.  
-If redmine/config/initializers/35_change_load_order_locales.rb is missing, only non-plugin messages can be customized.
-
 ## Usage
 
 * 1: Open setting page  

app/helpers/custom_message_settings_helper.rb

@@ -17,17 +17,17 @@ def normal_mode_input_fields(setting, lang)
       content += content_tag(:p) do
         content_tag(:label, k) +
         text_field_tag("settings[custom_messages][#{k}]", v.to_s) +
-        link_to_function('', '$(this).closest("p").remove();', class: 'icon icon-del clear-key-link')
+        link_to_function(sprite_icon('del'), '$(this).closest("p").remove()', class: 'icon clear-key-link')
       end
     end
     content
   end
 
   def open_default_messages_window_link(lang)
-    link_to l(:label_default_messages),
+    link_to sprite_icon('file', l(:label_default_messages)),
             default_messages_custom_message_settings_path(lang: lang),
-            class: 'icon icon-file text-plain',
+            class: 'icon text-plain',
             onclick: "window.open(this.href,'redmine_message_customize_plugin-default_messages', 'height=800, width=500');return false;",
             id: 'default-messages-link'
   end
-end
+end

app/views/custom_message_settings/_messages.html.erb

@@ -1,6 +1,6 @@
 <div>
   <%= select_tag 'select-key', available_message_options(@setting, lang), id: 'key-selector' %>
-  <span class='icon icon-help'><%= l(:text_description_of_search_box) %></span>
+  <span class='icon'><%= sprite_icon('help', l(:text_description_of_search_box)) %></span>
 </div>
 <br>
 <div class='tabular'>
@@ -43,10 +43,10 @@ function AddMessageInputField(key, val){
       name: 'settings[custom_messages][' + key + ']'
     }).appendTo($('#edit-custom-messages .tabular p:first'));
     $('<a>').attr({
-       class: 'icon icon-del clear-key-link',
+       class: 'icon clear-key-link',
        href: '#',
-       onclick: '$(this).closest("p").remove();; return false;'
-    }).appendTo($('#edit-custom-messages .tabular p:first'));
+       onclick: '$(this).closest("p").remove(); return false;'
+    }).html('<%= sprite_icon('del') %>').appendTo($('#edit-custom-messages .tabular p:first'));
     $('#key-selector').val('').change();
     $('#key-selector option[value="' + key + '"]').prop("disabled", true).change();
     setSelect2();

app/views/custom_message_settings/edit.html.erb

@@ -8,7 +8,7 @@
 <% end %>
 
 <div class='message-customize-menu contextual'>
-  <%= link_to (@setting.enabled? ? l(:label_disable_customize) : l(:label_enable_customize)), toggle_enabled_custom_message_settings_path, method: :post, class: 'icon icon-settings' %> /
+  <%= link_to sprite_icon('settings', (@setting.enabled? ? l(:label_disable_customize) : l(:label_enable_customize))), toggle_enabled_custom_message_settings_path, method: :post, class: 'icon' %> /
   <%= open_default_messages_window_link(@lang) %>
 </div>
 

init.rb

@@ -13,8 +13,8 @@
   author_url 'https://github.com/farend'
   settings default: { custom_messages: {} }
   menu :admin_menu, :custom_messages, { controller: 'custom_message_settings', action: 'edit' },
-         caption: :label_custom_messages, html: { class: 'icon icon-edit' }
-  requires_redmine version_or_higher: '3.2'
+         caption: :label_custom_messages, html: { class: 'icon' }, icon: 'edit'
+  requires_redmine version_or_higher: '6.0'
 end
 
 Rails.application.config.i18n.load_path += Dir.glob(File.join(p.directory, 'config', 'locales', 'custom_messages', '*.rb'))