fix: update some view template for event

- push event on github
- feature flat event on gitlab

Author: tanhongit

lang/de/events/github/push.php

@@ -3,7 +3,7 @@
 return [
     'default' => [
         'title' => '👷⚙️ <b>:count</b> new :noun to 🦑<b>:user:<code>:branch</code></b>',
-        'commit' => ':commit: :commit_message - by <i>:commit_name</i>',
+        'commit' => ':commit: :commit_message - by <i>:commit_by</i>',
         'pushed' => '👤 Pushed by : <b>:name</b>',
     ],
 ];

lang/en/events/github/push.php

@@ -3,7 +3,7 @@
 return [
     'default' => [
         'title' => '👷⚙️ <b>:count</b> new :noun to 🦑<b>:user:<code>:branch</code></b>',
-        'commit' => ':commit: :commit_message - by <i>:commit_name</i>',
+        'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
         'pushed' => '👤 Pushed by : <b>:name</b>',
     ],
 ];

lang/en/events/gitlab/feature_flag.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'title' => [
+        'enabled' => '<b>Feature Flag Enabled</b> 🦊:flag_tag by :user_tag',
+        'disabled' => '<b>Feature Flag Disabled</b> 🦊:flag_tag by :user_tag',
+    ],
+    'name' => 'Name: <b>:flag_name</b>',
+];

lang/en/events/shared/gitlab.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    '_body' => [
+        'title' => '📖 <b>Content:</b>',
+    ],
+    '_assignee' => [
+        'title' => '🙋 Assignee: ',
+    ],
+];

lang/ja/events/github/push.php

@@ -3,7 +3,7 @@
 return [
     'default' => [
         'title' => '👷⚙️ <b>:count</b> new :noun to 🦑<b>:user:<code>:branch</code></b>',
-        'commit' => ':commit: :commit_message - by <i>:commit_name</i>',
+        'commit' => ':commit: :commit_message - by <i>:commit_by</i>',
         'pushed' => '👤 Pushed by : <b>:name</b>',
     ],
 ];

lang/vi/events/github/push.php

@@ -3,7 +3,7 @@
 return [
     'default' => [
         'title' => '👷⚙️ <b>:count</b> new :noun to 🦑<b>:user:<code>:branch</code></b>',
-        'commit' => ':commit: :commit_message - by <i>:commit_name</i>',
+        'commit' => ':commit: :commit_message - by <i>:commit_by</i>',
         'pushed' => '👤 Pushed by : <b>:name</b>',
     ],
 ];

resources/views/events/github/push/default.blade.php

@@ -25,7 +25,7 @@
 {!! __('tg-notifier::events/github/push.default.commit', [
        'commit' => "<a href='$commit->url'>$commitId</a>",
        'commit_message' => $commit->message,
-       'commit_name' => $commit->author->name,
+       'commit_by' => $commit->author->name,
    ]
 ) !!}
 @endforeach

resources/views/events/gitlab/feature_flag/default.blade.php

@@ -1,22 +1,27 @@
 <?php
 /**
  * @var $payload mixed
+ * @var $event string
  */
 
+$flagUrl = $payload->project->web_url."/-/feature_flags/".$payload->object_attributes->id;
+$flatTag = "<a href=\"{$flagUrl}\">{$payload->project->path_with_namespace}#{$payload->object_attributes->name}</a>";
+$userTag = "<a href=\"{$payload->user_url}\">{$payload->user->name}</a>";
+
 if ($payload->object_attributes->active) {
-    $active = "Enabled";
+    $active = "enabled";
     $icon = "🚩";
 } else {
-    $active = "Disabled";
+    $active = "disabled";
     $icon = "🏴";
 }
+?>
 
-$flagUrl = $payload->project->web_url . "/-/feature_flags/" . $payload->object_attributes->id;
-
-$message = "{$icon} <b>Feature Flag {$active}</b> - 🦊<a href=\"{$flagUrl}\">{$payload->project->path_with_namespace}#{$payload->object_attributes->name}</a> by <a href=\"{$payload->user_url}\">{$payload->user->name}</a>\n\n";
-
-$message .= "{$icon} Name: <b>{$payload->object_attributes->name}</b> \n\n";
+{!! $icon !!} {!! __('tg-notifier::events/gitlab/feature_flag.title'.$active, [
+        'flag_tag' => $flagTag,
+        'user_tag' => $userTag,
+    ]) !!}
 
-$message .= require __DIR__ . '/../../shared/partials/gitlab/_body.php';
+{!! $icon !!} {!! __('tg-notifier::events/gitlab/feature_flag.name', ['flag_name' => $payload->object_attributes->name]) !!}
 
-echo $message;
+@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

resources/views/events/shared/partials/gitlab/_body.blade.php

@@ -1,8 +1,10 @@
 <?php
 /**
  * @var $payload mixed
+ * @var $event string
  */
 
+$html = '';
 if (isset($event) && isset($payload)) {
     if (!empty($payload->object_attributes->description)) {
         $body = $payload->object_attributes->description;
@@ -21,7 +23,9 @@
         $body = substr($body, 0, 50) . '...';
     }
 
-    return "📖 <b>Content:</b>\n{$body}";
+    $html = __('tg-notifier::events/shared/gitlab._body.title', ['body' => $body])
+        ."\n"
+        .htmlentities($body);
 }
-
-return '';
+?>
+{!! $html !!}