Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.x #39

Open
wants to merge 5 commits into
base: 3.x
Choose a base branch
from
Open

4.x #39

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion init.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "redmine_zulip"
require File.dirname(__FILE__) + "/lib/redmine_zulip"

Redmine::Plugin.register :redmine_zulip do
name 'Zulip'
Expand Down
9 changes: 3 additions & 6 deletions lib/redmine_zulip.rb
Original file line number Diff line number Diff line change
@@ -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)
22 changes: 11 additions & 11 deletions lib/redmine_zulip/issue_patch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down