Skip to content

Commit a067dac

Browse files
tanhongittanhongit
authored
Merge pull request #80 from tanhongit/update-event-template
Update gitlab and tool template and translations
2 parents 83980a1 + 155a2f4 commit a067dac

37 files changed

+78
-75
lines changed

‎lang/de/app.php

+2
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@
55
'unknown_callback' => 'Unknown Callback. Something went wrong!',
66
'invalid_request' => 'Invalid Request!',
77
'branch' => 'Branch',
8+
'commit' => 'Commit',
9+
'title' => 'Title',
810
];

‎lang/de/events/gitlab/push.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?php
22

33
return [
4-
'default' => [
5-
'title' => '<b>:count</b> new :noun to :repo:<code>:branch</code></b>',
6-
'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
7-
'pusher' => '👤 Pushed by : <b>:name</b>',
8-
],
4+
'title' => '<b>:count</b> new :noun to <b>:repo:<code>:branch</code></b>',
5+
'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
6+
'pusher' => 'Pushed by : <b>:name</b>',
7+
'new_branch_title' => '<b>A new branch has been pushed to the project</b> :repo',
98
];

‎lang/de/events/gitlab/tag_push.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
return [
44
'title' => '<b>A new tag has been pushed to the project</b> :repo',
5-
'name' => '<b>Tag Name</b>: :tag_name',
5+
'name' => 'Tag Name',
66
'pusher' => ' Pushed by',
77
];

‎lang/de/tools/start.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
return [
4-
'title' => '<b>🙋🏻 :appName 🤓</b>',
4+
'title' => '<b>:appName</b>',
55
'firstName' => 'Hey <b>:firstName</b>,',
66
'notification' => 'I can send you notifications from your 🦑<b>GitHub</b> or 🦊<b>GitLab</b> Repository instantly to your Telegram.
77
Use /menu for more options.',

‎lang/en/app.php

+2
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@
55
'unknown_callback' => 'Unknown Callback. Something went wrong!',
66
'invalid_request' => 'Invalid Request!',
77
'branch' => 'Branch',
8+
'commit' => 'Commit',
9+
'title' => 'Title',
810
];

‎lang/en/events/gitlab/push.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?php
22

33
return [
4-
'default' => [
5-
'title' => '<b>:count</b> new :noun to :repo:<code>:branch</code></b>',
6-
'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
7-
'pusher' => '👤 Pushed by : <b>:name</b>',
8-
],
4+
'title' => '<b>:count</b> new :noun to <b>:repo:<code>:branch</code></b>',
5+
'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
6+
'pusher' => 'Pushed by : <b>:name</b>',
7+
'new_branch_title' => '<b>A new branch has been pushed to the project</b> :repo',
98
];

‎lang/en/events/gitlab/tag_push.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
return [
44
'title' => '<b>A new tag has been pushed to the project</b> :repo',
5-
'name' => '<b>Tag Name</b>: :tag_name',
5+
'name' => 'Tag Name',
66
'pusher' => ' Pushed by',
77
];

‎lang/en/tools/start.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
return [
4-
'title' => '<b>🙋🏻 :appName 🤓</b>',
4+
'title' => '<b>:appName</b>',
55
'firstName' => 'Hey <b>:firstName</b>,',
66
'notification' => 'I can send you notifications from your 🦑<b>GitHub</b> or 🦊<b>GitLab</b> Repository instantly to your Telegram.
77
Use /menu for more options.',

‎lang/ja/app.php

+2
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@
55
'unknown_callback' => 'Unknown Callback. Something went wrong!',
66
'invalid_request' => 'Invalid Request!',
77
'branch' => 'Branch',
8+
'commit' => 'Commit',
9+
'title' => 'Title',
810
];

‎lang/ja/events/gitlab/push.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?php
22

33
return [
4-
'default' => [
5-
'title' => '<b>:count</b> new :noun to :repo:<code>:branch</code></b>',
6-
'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
7-
'pusher' => '👤 Pushed by : <b>:name</b>',
8-
],
4+
'title' => '<b>:count</b> new :noun to <b>:repo:<code>:branch</code></b>',
5+
'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
6+
'pusher' => 'Pushed by : <b>:name</b>',
7+
'new_branch_title' => '<b>A new branch has been pushed to the project</b> :repo',
98
];

‎lang/ja/events/gitlab/tag_push.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
return [
44
'title' => '<b>A new tag has been pushed to the project</b> :repo',
5-
'name' => '<b>Tag Name</b>: :tag_name',
5+
'name' => 'Tag Name',
66
'pusher' => ' Pushed by',
77
];

‎lang/ja/tools/start.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
return [
4-
'title' => '<b>🙋🏻 :appName 🤓</b>',
4+
'title' => '<b>:appName</b>',
55
'firstName' => 'Hey <b>:firstName</b>,',
66
'notification' => 'I can send you notifications from your 🦑<b>GitHub</b> or 🦊<b>GitLab</b> Repository instantly to your Telegram.
77
Use /menu for more options.',

‎lang/vi/app.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
22

33
return [
4-
'by' => 'by',
5-
'unknown_callback' => 'Unknown Callback. Something went wrong!',
6-
'invalid_request' => 'Invalid Request!',
7-
'branch' => 'Branch',
4+
'by' => 'bởi',
5+
'unknown_callback' => 'Không rõ Callback. Đã xảy ra lỗi!',
6+
'invalid_request' => 'Yêu cầu không hợp lệ!',
7+
'branch' => 'Tên nhánh',
8+
'commit' => 'Commit',
9+
'title' => 'Tiêu đề',
810
];

‎lang/vi/events/gitlab/issues.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
return [
44
'issue_title' => '📢',
55
'closed' => [
6-
'title' => '<b>Vấn đề đã đóng </b> từ :issue bởi :user',
6+
'title' => '<b>Vấn đề đã đóng </b> trong :issue bởi :user',
77
],
88
'edited' => [
9-
'title' => '<b>Vấn đề đã được chỉnh sửa</b> từ :issue bởi :user',
9+
'title' => '<b>Vấn đề đã được chỉnh sửa</b> trong :issue bởi :user',
1010
'changes' => [
1111
'title' => [
1212
'name' => '<b>Tiêu đề</b> đã được thay đổi',
@@ -20,7 +20,7 @@
2020
],
2121
],
2222
'opened' => [
23-
'title' => '<b>Vấn đề mới</b> tới :issue bởi :user',
23+
'title' => '<b>Vấn đề mới</b> trong :issue bởi :user',
2424
],
2525
'reopened' => [
2626
'title' => '<b>Vấn đề đã được mở lại</b> :issue bởi :user',

‎lang/vi/events/gitlab/note.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'commit' => '<b>Bình luận mới về Cam kết</b> - :repo bởi :user',
66
'issue' => '<b>Bình luận mới về vấn đề</b> - :repo bởi :user',
77
'merge_request' => '<b>Bình luận mới về yêu cầu hợp nhất</b> - :repo bởi :user',
8-
'snippet' => '<b>Bình luận mới về Đoạn trích</b> - :repo bởi :user',
8+
'snippet' => '<b>Bình luận mới về đoạn trích</b> - :repo bởi :user',
99
],
1010
'view_comment' => 'Xem bình luận: :link',
1111
'snippet_comment' => 'Xem bình luận về đoạn trích',

‎lang/vi/events/gitlab/push.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?php
22

33
return [
4-
'default' => [
5-
'title' => '<b>:count</b> mới :noun đến :repo:<code>:branch</code></b>',
6-
'commit' => '[:commit] :commit_message - bởi <i>:commit_by</i>',
7-
'pusher' => '👤 Đẩy lên bởi: : <b>:name</b>',
8-
],
4+
'title' => '<b>:count</b> :noun mới trong <b>:repo:<code>:branch</code></b>',
5+
'commit' => '[:commit] :commit_message - bởi <i>:commit_by</i>',
6+
'pusher' => 'Đẩy lên bởi: : <b>:name</b>',
7+
'new_branch_title' => '<b>Một nhánh mới đã được tạo trong dự án</b> :repo',
98
];

‎lang/vi/events/gitlab/tag_push.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
return [
44
'title' => '<b>Một thẻ mới đã được đẩy vào dự án</b> :repo',
5-
'name' => '<b>Tên thẻ</b>: :tag_name',
6-
'pusher' => 'Được đẩy bởi:',
5+
'name' => 'Tên thẻ',
6+
'pusher' => 'Được đẩy bởi',
77
];

‎lang/vi/tools/start.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
return [
4-
'title' => '<b>🙋🏻 :appName 🤓</b>',
4+
'title' => '<b>:appName</b>',
55
'firstName' => 'Hey <b>:firstName</b>,',
66
'notification' => 'I can send you notifications from your 🦑<b>GitHub</b> or 🦊<b>GitLab</b> Repository instantly to your Telegram.
77
Use /menu for more options.',

‎resources/views/events/gitlab/issue/close.blade.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
]
1212
) !!}
1313

14-
📢 <b>{{ $payload->object_attributes->title }}</b>
15-
14+
📢 {{ __('tg-notifier::app.title') }}: <code>{{ $payload->object_attributes->title }}</code>
1615
@include('tg-notifier::events.shared.partials.gitlab._assignees', compact('payload', 'event'))
1716
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/issue/open.blade.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
]
1212
) !!}
1313

14-
📢 <b>{{ $payload->object_attributes->title }}</b>
15-
14+
📢 {{ __('tg-notifier::app.title') }}: <code>{{ $payload->object_attributes->title }}</code>
1615
@include('tg-notifier::events.shared.partials.gitlab._assignees', compact('payload', 'event'))
1716
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/issue/reopen.blade.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
]
1212
) !!}
1313

14-
📢 <b>{{ $payload->object_attributes->title }}</b>
15-
14+
📢 {{ __('tg-notifier::app.title') }}: <code>{{ $payload->object_attributes->title }}</code>
1615
@include('tg-notifier::events.shared.partials.gitlab._assignees', compact('payload', 'event'))
1716
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/issue/update.blade.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
]
1212
) !!}
1313

14-
📢 <b>{{ $payload->object_attributes->title }}</b>
15-
14+
📢 {{ __('tg-notifier::app.title') }}: <code>{{ $payload->object_attributes->title }}</code>
1615
@include('tg-notifier::events.shared.partials.gitlab._assignees', compact('payload', 'event'))
17-
1816
@if(isset($payload->changes->title))
1917
📖 {!! __('tg-notifier::events/gitlab/issues.edited.changes.title.name') !!}
2018
📝 {!! __('tg-notifier::events/gitlab/issues.edited.changes.title.from', ['title_from' => $payload->changes->title->previous]) !!}

‎resources/views/events/gitlab/merge_request/approval.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
?>
88
👍 {!! __('tg-notifier::events/gitlab/merge_request.approval.title', [
99
'repo' => "✅ - 🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->iid}</a>",
10-
'user' => "<b>{$payload->user->name}</b>"
10+
'user' => "<code>{$payload->user->name}</code>"
1111
]) !!}
1212

1313
🛠 <b>{{ $payload->object_attributes->title }}</b>
1414

15-
🌳 {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
15+
🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
1616
@include('tg-notifier::events.shared.partials.gitlab._assignees', compact('payload', 'event'))
1717
@include('tg-notifier::events.gitlab.merge_request.partials._reviewers', compact('payload'))
1818
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/merge_request/approved.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
?>
88
👍 {!! __('tg-notifier::events/gitlab/merge_request.approved.title', [
99
'repo' => "✅ - 🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->iid}</a>",
10-
'user' => "<b>{$payload->user->name}</b>"
10+
'user' => "<code>{$payload->user->name}</code>"
1111
]) !!}
1212

1313
🛠 <b>{{ $payload->object_attributes->title }}</b>
1414

15-
🌳 {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
15+
🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
1616
@include('tg-notifier::events.shared.partials.gitlab._assignees', compact('payload', 'event'))
1717
@include('tg-notifier::events.gitlab.merge_request.partials._reviewers', compact('payload'))
1818
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/merge_request/close.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
🛠 <b>{{ $payload->object_attributes->title }}</b>
1414

15-
🌳 {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
15+
🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
1616
@include('tg-notifier::events.shared.partials.gitlab._assignees', compact('payload', 'event'))
1717
@include('tg-notifier::events.gitlab.merge_request.partials._reviewers', compact('payload'))
1818
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/merge_request/merge.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
🛠 <b>{{ $payload->object_attributes->title }}</b>
1414

15-
🌳 {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
15+
🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
1616
@include('tg-notifier::events.shared.partials.gitlab._assignees', compact('payload', 'event'))
1717
@include('tg-notifier::events.gitlab.merge_request.partials._reviewers', compact('payload'))
1818
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/merge_request/open.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
🛠 <b>{{ $payload->object_attributes->title }}</b>
1414

15-
🌳 {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
15+
🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
1616
@include('tg-notifier::events.shared.partials.gitlab._assignees', compact('payload', 'event'))
1717
@include('tg-notifier::events.gitlab.merge_request.partials._reviewers', compact('payload'))
1818
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/merge_request/reopen.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
🛠 <b>{{ $payload->object_attributes->title }}</b>
1414

15-
🌳 {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
15+
🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
1616
@include('tg-notifier::events.shared.partials.gitlab._assignees', compact('payload', 'event'))
1717
@include('tg-notifier::events.gitlab.merge_request.partials._reviewers', compact('payload'))
1818
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/merge_request/unapproval.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
🛠 <b>{{ $payload->object_attributes->title }}</b>
1414

15-
🌳 {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
15+
🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
1616
@include('tg-notifier::events.shared.partials.gitlab._assignees', compact('payload', 'event'))
1717
@include('tg-notifier::events.gitlab.merge_request.partials._reviewers', compact('payload'))
1818
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/merge_request/unapproved.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
🛠 <b>{{ $payload->object_attributes->title }}</b>
1414

15-
🌳 {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
15+
🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
1616
@include('tg-notifier::events.shared.partials.gitlab._assignees', compact('payload', 'event'))
1717
@include('tg-notifier::events.gitlab.merge_request.partials._reviewers', compact('payload'))
1818
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/merge_request/update.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
🛠 <b>{{ $payload->object_attributes->title }}</b>
1414

15-
🌳 {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
15+
🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->source_branch }} -> {{ $payload->object_attributes->target_branch }} 🎯
1616
@include('tg-notifier::events.shared.partials.gitlab._assignees', compact('payload', 'event'))
1717
@include('tg-notifier::events.gitlab.merge_request.partials._reviewers', compact('payload'))
1818
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/note/commit.blade.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
?>
88
💬 {!! __('tg-notifier::events/gitlab/note.title.commit', [
99
'repo' => "🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}</a>",
10-
'user' => "<b>{$payload->user->name}</b>"
10+
'user' => "<code>{$payload->user->name}</code>"
1111
]
1212
) !!}
1313

14-
⚙️ <b>{{ $payload->commit->message }}</b>
15-
14+
⚙️ {{ __('tg-notifier::app.commit') }}: <code>{{ $payload->commit->message }}</code>
1615
🔗 {!! __('tg-notifier::events/gitlab/note.view_comment', [
1716
'link' => "<a href='{$payload->object_attributes->url}'>{$payload->commit->id}</a>"
1817
]
1918
) !!}
20-
2119
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/note/issue.blade.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@
1111
]
1212
) !!}
1313

14-
📢 <b>{{ $payload->issue->title }}</b>
15-
14+
📢 <code>{{ $payload->issue->title }}</code>
1615
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/note/merge_request.blade.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
]
1212
) !!}
1313

14-
🛠 <b>{{ $payload->merge_request->title }}</b>
15-
🌳 {{ $payload->merge_request->source_branch }} -> {{ $payload->merge_request->target_branch }} 🎯
16-
14+
🛠 <code>{{ $payload->merge_request->title }}</code>
15+
🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->merge_request->source_branch }} -> {{ $payload->merge_request->target_branch }} 🎯
1716
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/note/snippet.blade.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
]
1212
) !!}
1313

14-
📝 <b>{{ $payload->snippet->title }}</b>
15-
14+
📝 {{ __('tg-notifier::app.title') }}: <code>{{ $payload->snippet->title }}</code>
1615
🔗 <a href="{{ $payload->object_attributes->url }}">{{ __('tg-notifier::events/gitlab/note.snippet_comment') }}</a>
17-
1816
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

0 commit comments

Comments
 (0)