diff --git a/README.md b/README.md index 0ed6683..f7d84d3 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ Get Zulip notifications for your Redmine issues! | 1.x | 3.x | | 2.x | 3.x | | 3.x | 4.x | +| 4.x | 5.x | ## Installing diff --git a/init.rb b/init.rb index 9c1237d..4a5afea 100644 --- a/init.rb +++ b/init.rb @@ -1,4 +1,4 @@ -require "redmine_zulip" +require File.dirname(__FILE__) + "/lib/redmine_zulip" Redmine::Plugin.register :redmine_zulip do name 'Zulip' diff --git a/lib/redmine_zulip.rb b/lib/redmine_zulip.rb index 387a9d8..26aeb71 100644 --- a/lib/redmine_zulip.rb +++ b/lib/redmine_zulip.rb @@ -1,9 +1,6 @@ module RedmineZulip VERSION = "3.1.2" end - -Rails.configuration.to_prepare do - Issue.send(:include, RedmineZulip::IssuePatch) - Project.send(:include, RedmineZulip::ProjectPatch) - ProjectsController.send(:helper, RedmineZulip::ProjectSettingsTabs) -end +Issue.send(:include, RedmineZulip::IssuePatch) +Project.send(:include, RedmineZulip::ProjectPatch) +ProjectsController.send(:helper, RedmineZulip::ProjectSettingsTabs) diff --git a/lib/redmine_zulip/issue_patch.rb b/lib/redmine_zulip/issue_patch.rb index d3a0a64..0a672ef 100644 --- a/lib/redmine_zulip/issue_patch.rb +++ b/lib/redmine_zulip/issue_patch.rb @@ -112,7 +112,7 @@ def zulip_api def notify_assignment locale = assigned_to.language.present? ? assigned_to.language : Setting.default_language - message = I18n.t("zulip_notify_assignment", { + message = I18n.t("zulip_notify_assignment", **{ locale: locale, user: User.current.name, id: id, @@ -144,7 +144,7 @@ def notify_unassignment ) locale = previous_assigned_to.language.present? ? previous_assigned_to.language : Setting.default_language - message = I18n.t("zulip_notify_unassignment", { + message = I18n.t("zulip_notify_unassignment", **{ user: User.current.name, id: id, url: url, @@ -162,7 +162,7 @@ def notify_unassignment def notify_assigned_to_issue_updated locale = assigned_to.language.present? ? assigned_to.language : Setting.default_language - message = I18n.t("zulip_notify_updated", { + message = I18n.t("zulip_notify_updated", **{ user: User.current.name, id: id, url: url, @@ -223,7 +223,7 @@ def notify_assigned_to_issue_updated def notify_assigned_to_issue_destroyed locale = assigned_to.language.present? ? assigned_to.language : Setting.default_language - message = I18n.t("zulip_notify_destroyed", { + message = I18n.t("zulip_notify_destroyed", **{ user: User.current.name, id: id, project: project.name, @@ -239,7 +239,7 @@ def notify_assigned_to_issue_destroyed def init_issue_subject locale = Setting.default_language - message = I18n.t("zulip_init_issue_subject", { + message = I18n.t("zulip_init_issue_subject", **{ locale: locale, user: User.current.name, id: id, @@ -270,7 +270,7 @@ def init_issue_subject def update_issue_subject locale = Setting.default_language - message = I18n.t("zulip_notify_updated", { + message = I18n.t("zulip_notify_updated", **{ locale: locale, user: User.current.name, id: id, @@ -341,7 +341,7 @@ def update_issue_subject end def update_issue_subject_destroyed - message = I18n.t("zulip_notify_destroyed", { + message = I18n.t("zulip_notify_destroyed", **{ locale: Setting.default_language, user: User.current.name, id: id, @@ -357,7 +357,7 @@ def update_issue_subject_destroyed end def update_version_subject_added - message = I18n.t("zulip_update_version_subject_added", { + message = I18n.t("zulip_update_version_subject_added", **{ locale: Setting.default_language, user: User.current.name, id: id, @@ -378,7 +378,7 @@ def update_version_subject_removed previous_fixed_version = Version.find( previous_changes["fixed_version_id"].first ) - message = I18n.t("zulip_update_version_subject_removed", { + message = I18n.t("zulip_update_version_subject_removed", **{ locale: Setting.default_language, user: User.current.name, id: id, @@ -397,7 +397,7 @@ def update_version_subject_removed def update_version_subject_status previous_status_id = previous_changes["status_id"].first - message = I18n.t("zulip_update_version_subject_status", { + message = I18n.t("zulip_update_version_subject_status", **{ locale: Setting.default_language, user: User.current.name, id: id, @@ -416,7 +416,7 @@ def update_version_subject_status end def update_version_subject_destroyed - message = I18n.t("zulip_notify_destroyed", { + message = I18n.t("zulip_notify_destroyed", **{ locale: Setting.default_language, user: User.current.name, id: id,