diff --git a/app/Enums/MessageTemplateNameEnum.php b/app/Enums/MessageTemplateNameEnum.php new file mode 100644 index 00000000..a0ac8b6c --- /dev/null +++ b/app/Enums/MessageTemplateNameEnum.php @@ -0,0 +1,18 @@ + nexus_trans("message-template.register_welcome"), + default => '', + }; + } +} diff --git a/app/Enums/ModelEventEnum.php b/app/Enums/ModelEventEnum.php index f627d2ce..905b6d2d 100644 --- a/app/Enums/ModelEventEnum.php +++ b/app/Enums/ModelEventEnum.php @@ -2,6 +2,7 @@ namespace App\Enums; +use App\Events\MessageCreated; use App\Events\NewsCreated; use App\Events\SnatchedUpdated; use App\Events\TorrentCreated; @@ -12,6 +13,7 @@ use App\Events\UserDeleted; use App\Events\UserDisabled; use App\Events\UserEnabled; use App\Events\UserUpdated; +use App\Models\Message; use App\Models\News; use App\Models\Snatch; use App\Models\Torrent; @@ -31,6 +33,7 @@ final class ModelEventEnum { const NEWS_CREATED = 'news_created'; const SNATCHED_UPDATED = 'snatched_updated'; + const MESSAGE_CREATED = 'message_created'; public static array $eventMaps = [ self::TORRENT_CREATED => ['event' => TorrentCreated::class, 'model' => Torrent::class], @@ -46,5 +49,7 @@ final class ModelEventEnum { self::NEWS_CREATED => ['event' => NewsCreated::class, 'model' => News::class], self::SNATCHED_UPDATED => ['event' => SnatchedUpdated::class, 'model' => Snatch::class], + + self::MESSAGE_CREATED => ['event' => MessageCreated::class, 'model' => Message::class], ]; } diff --git a/app/Events/MessageCreated.php b/app/Events/MessageCreated.php new file mode 100644 index 00000000..b8e03000 --- /dev/null +++ b/app/Events/MessageCreated.php @@ -0,0 +1,41 @@ +model = $model; + } + + /** + * Get the channels the event should broadcast on. + * + * @return array + */ + public function broadcastOn(): array + { + return [ + new PrivateChannel('channel-name'), + ]; + } +} diff --git a/app/Filament/Resources/System/MessageTemplateResource.php b/app/Filament/Resources/System/MessageTemplateResource.php new file mode 100644 index 00000000..09f0be47 --- /dev/null +++ b/app/Filament/Resources/System/MessageTemplateResource.php @@ -0,0 +1,110 @@ +first(fn ($item) => $item->site_lang_folder == Setting::getDefaultLang()); + return $form + ->schema([ + Forms\Components\Select::make('name') + ->label(__('label.name')) + ->options(MessageTemplate::listAllNames()) + ->columnSpanFull() + ->required(), + Forms\Components\Select::make('language_id') + ->label(__('label.language')) + ->options($languages->pluck('lang_name', 'id')) + ->default($default ? $default->id : null) + ->columnSpanFull() + ->required(), + Forms\Components\Textarea::make('content') + ->label(__('label.content')) + ->helperText(new HtmlString(__('message-template.content_help')."
".__('message-template.register_welcome_content_help'))) + ->columnSpanFull() + ->rows(10) + ->required(), + + ]); + } + + public static function table(Table $table): Table + { + return $table + ->columns([ + Tables\Columns\TextColumn::make('id'), + Tables\Columns\TextColumn::make('name') + ->label(__('label.name')) + ->formatStateUsing(fn ($state) => $state->label()) + , + Tables\Columns\TextColumn::make('language.lang_name') + ->label(__('label.language')) + , + Tables\Columns\TextColumn::make('updated_at') + ->label(__('label.updated_at')) + , + ]) + ->filters([ + Tables\Filters\SelectFilter::make('name') + ->label(__('label.name')) + ->options(MessageTemplate::listAllNames()) + , + Tables\Filters\SelectFilter::make('language_id') + ->label(__('label.language')) + ->options(Language::all()->pluck('lang_name', 'id')) + , + ]) + ->actions([ + Tables\Actions\EditAction::make(), + Tables\Actions\DeleteAction::make(), + ]) + ->bulkActions([ + Tables\Actions\BulkActionGroup::make([ + Tables\Actions\DeleteBulkAction::make(), + ]), + ]); + } + + public static function getPages(): array + { + return [ + 'index' => Pages\ManageMessageTemplates::route('/'), + ]; + } +} diff --git a/app/Filament/Resources/System/MessageTemplateResource/Pages/ManageMessageTemplates.php b/app/Filament/Resources/System/MessageTemplateResource/Pages/ManageMessageTemplates.php new file mode 100644 index 00000000..bf0d82e1 --- /dev/null +++ b/app/Filament/Resources/System/MessageTemplateResource/Pages/ManageMessageTemplates.php @@ -0,0 +1,20 @@ +belongsTo(User::class, 'receiver'); } - public static function add(array $data): bool + public static function add(array $data): self { clear_inbox_count_cache($data["receiver"]); - return self::query()->insert($data); + $message = self::query()->create($data); + fire_event(ModelEventEnum::MESSAGE_CREATED, $message); + return $message; } } diff --git a/app/Models/MessageTemplate.php b/app/Models/MessageTemplate.php new file mode 100644 index 00000000..81ab607d --- /dev/null +++ b/app/Models/MessageTemplate.php @@ -0,0 +1,48 @@ + MessageTemplateNameEnum::class, + ]; + + public static function listAllNames(): array + { + $result = []; + foreach (MessageTemplateNameEnum::cases() as $messageTemplate) { + $result[$messageTemplate->value] = $messageTemplate->label(); + } + return $result; + } + + public function language(): BelongsTo + { + return $this->belongsTo(Language::class); + } + + public static function forRegisterWelcome($languageId, array $placeholders): null|string + { + $result = self::query()->where("language_id", $languageId) + ->where('name', MessageTemplateNameEnum::REGISTER_WELCOME->value) + ->first(); + return self::format($result, $placeholders); + } + + private static function format(self|null $template, array $placeholders): null|string + { + if ($template && $template->content) { + $search = array_map(function ($value) {return ":$value";}, array_keys($placeholders)); + return str_replace($search, array_values($placeholders), $template->content); + } + return null; + } +} diff --git a/app/Models/PluginStore.php b/app/Models/PluginStore.php index 2873810d..ccdf80cd 100644 --- a/app/Models/PluginStore.php +++ b/app/Models/PluginStore.php @@ -69,8 +69,13 @@ class PluginStore extends Model public function hasNewVersion(): bool { - return $this->installed_version + $result = $this->installed_version && version_compare($this->version, $this->installed_version, '>'); + do_log(sprintf( + "%s, installed_version: %s, version: %s, hasNew: %s", + $this->plugin_id, $this->installed_version, $this->version, $result + )); + return $result; } public static function getInfo(string $id) diff --git a/app/Models/User.php b/app/Models/User.php index 48bcc0ec..5e46173b 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -299,7 +299,7 @@ class User extends Authenticatable implements FilamentUser, HasName $log .= ", locale from cookie: $locale"; } if (!$locale) { - $lang = $this->language->site_lang_folder; + $lang = $this->language?->site_lang_folder ?? null; $locale = Locale::$languageMaps[$lang] ?? $lang; $log .= ", [NO_DATA_FROM_COOKIE], lang from database: $lang, locale: $locale"; } diff --git a/database/migrations/2025_06_18_210723_create_message_templates_table.php b/database/migrations/2025_06_18_210723_create_message_templates_table.php new file mode 100644 index 00000000..dd7331b9 --- /dev/null +++ b/database/migrations/2025_06_18_210723_create_message_templates_table.php @@ -0,0 +1,31 @@ +id(); + $table->string('name'); + $table->integer('language_id'); + $table->text('content'); + $table->timestamps(); + $table->unique(['name', 'language_id']); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('message_templates'); + } +}; diff --git a/include/constants.php b/include/constants.php index 3653dd8c..791eb03e 100644 --- a/include/constants.php +++ b/include/constants.php @@ -1,6 +1,6 @@ 0 ? $iniupload_main : 0).")") or sqlerr(__FILE__, __LINE__); $id = mysql_insert_id(); -fire_event("user_created", \App\Models\User::query()->find($id, \App\Models\User::$commonFields)); +$userInfo = \App\Models\User::query()->find($id, \App\Models\User::$commonFields); +fire_event("user_created", $userInfo); $tmpInviteCount = get_setting('main.tmp_invite_count'); if ($tmpInviteCount > 0) { $userRep = new \App\Repositories\UserRepository(); @@ -181,7 +182,10 @@ if ($tmpInviteCount > 0) { $dt = date("Y-m-d H:i:s"); $subject = $lang_takesignup['msg_subject'].$SITENAME."!"; $siteName = \App\Models\Setting::getSiteName(); -$msg = $lang_takesignup['msg_congratulations'].$wantusername.sprintf($lang_takesignup['msg_you_are_a_member'],$siteName, $siteName); +$msg = \App\Models\MessageTemplate::forRegisterWelcome($userInfo->lang, ['username' => $userInfo->username]); +if (empty($msg)) { + $msg = $lang_takesignup['msg_congratulations'].$wantusername.sprintf($lang_takesignup['msg_you_are_a_member'],$siteName, $siteName); +} \App\Models\Message::add([ 'sender' => 0, 'receiver' => $id, diff --git a/resources/lang/cs/admin.php b/resources/lang/cs/admin.php index cb75af3b..a0077dfa 100644 --- a/resources/lang/cs/admin.php +++ b/resources/lang/cs/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Poskytovatel autorizace', 'queue_monitor' => 'Monitor fronty', 'user_modify_logs' => 'Záznamy změn uživatele', + 'message_templates' => 'Šablony zpráv', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/cs/label.php b/resources/lang/cs/label.php index 5c19115b..7dd935c3 100644 --- a/resources/lang/cs/label.php +++ b/resources/lang/cs/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Vytvořeno na konci', 'text_quote' => 'Cenová nabídka', 'text_code' => "STRUKTURA ČISTÝCH POZIC PODLE RIZIKOVÝCH VAH", + 'language' => 'Jazyk', + 'content' => 'Obsah', 'setting' => [ 'nav_text' => 'Nastavení', 'backup' => [ diff --git a/resources/lang/cs/message-template.php b/resources/lang/cs/message-template.php new file mode 100644 index 00000000..9b8ed865 --- /dev/null +++ b/resources/lang/cs/message-template.php @@ -0,0 +1,6 @@ + 'Zde můžete použít BBCode kódy a následující zástupné symboly', + 'register_welcome' => 'Registrace úspěšná uvítací zpráva', + 'register_welcome_content_help' => ':username => uživatelské jméno', +]; diff --git a/resources/lang/cs/token.php b/resources/lang/cs/token.php index 83272eff..1bf244b5 100644 --- a/resources/lang/cs/token.php +++ b/resources/lang/cs/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'Token byl úspěšně vytvořen, tato data se zobrazí pouze jednou, uložte jej správně

:token', 'last_used_at' => 'Poslední čas používání', 'token' => 'summary', + "permission_not_allowed" => "Oprávnění::permission_text není povoleno" ); diff --git a/resources/lang/da/admin.php b/resources/lang/da/admin.php index 650b7552..91932484 100644 --- a/resources/lang/da/admin.php +++ b/resources/lang/da/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Autorisationsudbyder', 'queue_monitor' => 'Overvågning af kø', 'user_modify_logs' => 'Bruger ændre logs', + 'message_templates' => 'Besked skabeloner', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/da/label.php b/resources/lang/da/label.php index 1779c6c9..75c055db 100644 --- a/resources/lang/da/label.php +++ b/resources/lang/da/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Oprettet i slutningen', 'text_quote' => 'Tilbud', 'text_code' => "Kode", + 'language' => 'Sprog', + 'content' => 'Indhold', 'setting' => [ 'nav_text' => 'Indstilling', 'backup' => [ diff --git a/resources/lang/da/message-template.php b/resources/lang/da/message-template.php new file mode 100644 index 00000000..9f69e936 --- /dev/null +++ b/resources/lang/da/message-template.php @@ -0,0 +1,6 @@ + 'Her kan du bruge BBCode tag koder og følgende pladsholdere', + 'register_welcome' => 'Velkomstbesked om registrering lykkedes', + 'register_welcome_content_help' => ':username => brugernavn', +]; diff --git a/resources/lang/da/token.php b/resources/lang/da/token.php index 78d86ae5..82935c40 100644 --- a/resources/lang/da/token.php +++ b/resources/lang/da/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'Token blev oprettet med succes, denne data vises kun én gang, gem den korrekt

:token', 'last_used_at' => 'Seneste anvendelsestid', 'token' => 'summary', + "permission_not_allowed" => "Tilladelse::permission_text ikke tilladt" ); diff --git a/resources/lang/de/admin.php b/resources/lang/de/admin.php index 03ceb218..79efe7c0 100644 --- a/resources/lang/de/admin.php +++ b/resources/lang/de/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Autorisierungsanbieter', 'queue_monitor' => 'Warteschlange Monitor', 'user_modify_logs' => 'Benutzerprotokolle ändern', + 'message_templates' => 'Nachrichtenvorlagen', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/de/label.php b/resources/lang/de/label.php index d42796bd..0a14840a 100644 --- a/resources/lang/de/label.php +++ b/resources/lang/de/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Erstellt am Ende', 'text_quote' => 'Zitat', 'text_code' => "CODE", + 'language' => 'Sprache', + 'content' => 'Inhalt', 'setting' => [ 'nav_text' => 'Einstellung', 'backup' => [ diff --git a/resources/lang/de/message-template.php b/resources/lang/de/message-template.php new file mode 100644 index 00000000..c08d5425 --- /dev/null +++ b/resources/lang/de/message-template.php @@ -0,0 +1,6 @@ + 'Hier können Sie BBCode Tag-Codes und die folgenden Platzhalter verwenden', + 'register_welcome' => 'Registrierung erfolgreich Willkommensnachricht', + 'register_welcome_content_help' => ':username => Benutzername', +]; diff --git a/resources/lang/de/token.php b/resources/lang/de/token.php index d8182cdf..a7c4b69c 100644 --- a/resources/lang/de/token.php +++ b/resources/lang/de/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'Das Token wurde erfolgreich erstellt. Diese Daten werden nur einmal angezeigt, bitte speichern Sie es ordnungsgemäß

:token', 'last_used_at' => 'Letzte Benutzungszeit', 'token' => 'summary', + "permission_not_allowed" => "Berechtigung::permission_text nicht erlaubt" ); diff --git a/resources/lang/el/admin.php b/resources/lang/el/admin.php index f8b21a24..d13c2c64 100644 --- a/resources/lang/el/admin.php +++ b/resources/lang/el/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Πάροχος εξουσιοδότησης', 'queue_monitor' => 'Οθόνη αναμονής', 'user_modify_logs' => 'Αρχεία καταγραφής τροποποίησης χρήστη', + 'message_templates' => 'Πρότυπα μηνυμάτων', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/el/label.php b/resources/lang/el/label.php index 295fd7d8..ccc0c509 100644 --- a/resources/lang/el/label.php +++ b/resources/lang/el/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Δημιουργήθηκε στο τέλος', 'text_quote' => 'Παράθεση', 'text_code' => "ΚΩΔΙΚΟΣ", + 'language' => 'Γλώσσα', + 'content' => 'Περιεχόμενο', 'setting' => [ 'nav_text' => 'Ρύθμιση', 'backup' => [ diff --git a/resources/lang/el/message-template.php b/resources/lang/el/message-template.php new file mode 100644 index 00000000..77c48407 --- /dev/null +++ b/resources/lang/el/message-template.php @@ -0,0 +1,6 @@ + 'Εδώ μπορείτε να χρησιμοποιήσετε τους κωδικούς ετικετών BBCode και τα ακόλουθα σύμβολα κράτησης θέσης', + 'register_welcome' => 'Εγγραφή μήνυμα καλωσορίσματος', + 'register_welcome_content_help' => ':username => όνομα χρήστη', +]; diff --git a/resources/lang/el/token.php b/resources/lang/el/token.php index 098edc54..34417a10 100644 --- a/resources/lang/el/token.php +++ b/resources/lang/el/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'Το διακριτικό δημιουργήθηκε με επιτυχία, αυτά τα δεδομένα εμφανίζονται μόνο μία φορά, παρακαλώ αποθηκεύστε τα σωστά

:token', 'last_used_at' => 'Πρόσφατος χρόνος χρήσης', 'token' => 'summary', + "permission_not_allowed" => "Permission::permission_text not allowed" ); diff --git a/resources/lang/en/admin.php b/resources/lang/en/admin.php index a722f3d5..401e4aff 100644 --- a/resources/lang/en/admin.php +++ b/resources/lang/en/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Authorization provider', 'queue_monitor' => 'Queue monitor', 'user_modify_logs' => 'User modify logs', + 'message_templates' => 'Message templates', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/en/label.php b/resources/lang/en/label.php index fc4022f3..eff3d96f 100644 --- a/resources/lang/en/label.php +++ b/resources/lang/en/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Created at end', 'text_quote' => 'Quote', 'text_code' => "CODE", + 'language' => 'Language', + 'content' => 'Content', 'setting' => [ 'nav_text' => 'Setting', 'backup' => [ diff --git a/resources/lang/en/message-template.php b/resources/lang/en/message-template.php new file mode 100644 index 00000000..4e89c49b --- /dev/null +++ b/resources/lang/en/message-template.php @@ -0,0 +1,6 @@ + 'Here you can use BBCode tag codes and the following placeholders', + 'register_welcome' => 'Registration success welcome message', + 'register_welcome_content_help' => ':username => username', +]; diff --git a/resources/lang/es/admin.php b/resources/lang/es/admin.php index 351cb29b..12ad7dab 100644 --- a/resources/lang/es/admin.php +++ b/resources/lang/es/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Proveedor de autorización', 'queue_monitor' => 'Monitor de cola', 'user_modify_logs' => 'Usuario modificar registros', + 'message_templates' => 'Plantillas de mensaje', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/es/label.php b/resources/lang/es/label.php index 8468c7b5..dc3a8669 100644 --- a/resources/lang/es/label.php +++ b/resources/lang/es/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Creado al final', 'text_quote' => 'Cotización', 'text_code' => "CÓDIGO", + 'language' => 'Idioma', + 'content' => 'Contenido', 'setting' => [ 'nav_text' => 'Ajustes', 'backup' => [ diff --git a/resources/lang/es/message-template.php b/resources/lang/es/message-template.php new file mode 100644 index 00000000..e8c5fd1d --- /dev/null +++ b/resources/lang/es/message-template.php @@ -0,0 +1,6 @@ + 'Aquí puedes usar códigos de etiquetas BBCode y los siguientes marcadores de posición', + 'register_welcome' => 'Mensaje de bienvenida de registro exitoso', + 'register_welcome_content_help' => ':username => nombre de usuario', +]; diff --git a/resources/lang/es/token.php b/resources/lang/es/token.php index 652b2c76..7173a53c 100644 --- a/resources/lang/es/token.php +++ b/resources/lang/es/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'El token fue creado con éxito, estos datos se muestran una sola vez, por favor guárdelo correctamente

:token', 'last_used_at' => 'Tiempo de uso reciente', 'token' => 'summary', + "permission_not_allowed" => "Permiso::permission_text no permitido" ); diff --git a/resources/lang/fi/admin.php b/resources/lang/fi/admin.php index 123f83d5..8db1b76f 100644 --- a/resources/lang/fi/admin.php +++ b/resources/lang/fi/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Valtuutuksen tarjoaja', 'queue_monitor' => 'Jonon monitori', 'user_modify_logs' => 'Käyttäjä muokkaa lokeja', + 'message_templates' => 'Viestin pohjat', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/fi/label.php b/resources/lang/fi/label.php index a9fe39eb..11fe9750 100644 --- a/resources/lang/fi/label.php +++ b/resources/lang/fi/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Luotu lopussa', 'text_quote' => 'Tarjous', 'text_code' => "KOODI", + 'language' => 'Kieli', + 'content' => 'Sisältö', 'setting' => [ 'nav_text' => 'Asetus', 'backup' => [ diff --git a/resources/lang/fi/message-template.php b/resources/lang/fi/message-template.php new file mode 100644 index 00000000..edb9422d --- /dev/null +++ b/resources/lang/fi/message-template.php @@ -0,0 +1,6 @@ + 'Täällä voit käyttää BBCode tag koodeja ja seuraavia paikkamerkkejä', + 'register_welcome' => 'Ilmoittautuminen onnistui tervetuliaisviesti', + 'register_welcome_content_help' => ':username => käyttäjänimi', +]; diff --git a/resources/lang/fi/token.php b/resources/lang/fi/token.php index 8f113dbc..94e91382 100644 --- a/resources/lang/fi/token.php +++ b/resources/lang/fi/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'Tunnus luotiin onnistuneesti, nämä tiedot näytetään vain kerran, tallenna ne oikein

:token', 'last_used_at' => 'Äskettäinen käyttöaika', 'token' => 'summary', + "permission_not_allowed" => "Käyttöoikeus::permission_text ei sallittu" ); diff --git a/resources/lang/fr/admin.php b/resources/lang/fr/admin.php index d8fd5c95..3d9ee72f 100644 --- a/resources/lang/fr/admin.php +++ b/resources/lang/fr/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Fournisseur d\'autorisation', 'queue_monitor' => 'Moniteur de file d\'attente', 'user_modify_logs' => 'Journaux de modification de l\'utilisateur', + 'message_templates' => 'Modèles de message', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/fr/label.php b/resources/lang/fr/label.php index c152625d..ae9ece06 100644 --- a/resources/lang/fr/label.php +++ b/resources/lang/fr/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Créé à la fin', 'text_quote' => 'Devis', 'text_code' => "CODE", + 'language' => 'Langue', + 'content' => 'Contenus', 'setting' => [ 'nav_text' => 'Réglages', 'backup' => [ diff --git a/resources/lang/fr/message-template.php b/resources/lang/fr/message-template.php new file mode 100644 index 00000000..f7749c08 --- /dev/null +++ b/resources/lang/fr/message-template.php @@ -0,0 +1,6 @@ + 'Ici vous pouvez utiliser des codes de balises BBCode et les espaces réservés suivants', + 'register_welcome' => 'Message de bienvenue pour l\'inscription', + 'register_welcome_content_help' => ':username => nom d\'utilisateur', +]; diff --git a/resources/lang/fr/token.php b/resources/lang/fr/token.php index 22ea688d..62dbe953 100644 --- a/resources/lang/fr/token.php +++ b/resources/lang/fr/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'Le jeton a été créé avec succès, ces données ne sont affichées qu\'une seule fois, veuillez l\'enregistrer correctement

:token', 'last_used_at' => 'Temps d\'utilisation récent', 'token' => 'summary', + "permission_not_allowed" => "Autorisation::permission_text non autorisée" ); diff --git a/resources/lang/it/admin.php b/resources/lang/it/admin.php index 0e5230e6..031241c1 100644 --- a/resources/lang/it/admin.php +++ b/resources/lang/it/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Provider di autorizzazione', 'queue_monitor' => 'Monitor coda', 'user_modify_logs' => 'Modificare i log dell\'utente', + 'message_templates' => 'Modelli di messaggi', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/it/label.php b/resources/lang/it/label.php index be2a755c..b96ce232 100644 --- a/resources/lang/it/label.php +++ b/resources/lang/it/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Creato alla fine', 'text_quote' => 'Preventivo', 'text_code' => "CODICE", + 'language' => 'Lingua', + 'content' => 'Contenuto', 'setting' => [ 'nav_text' => 'Impostazione', 'backup' => [ diff --git a/resources/lang/it/message-template.php b/resources/lang/it/message-template.php new file mode 100644 index 00000000..d449d801 --- /dev/null +++ b/resources/lang/it/message-template.php @@ -0,0 +1,6 @@ + 'Qui puoi usare i codici dei tag BBCode e i seguenti segnaposto', + 'register_welcome' => 'Messaggio di benvenuto per la registrazione', + 'register_welcome_content_help' => ':username => username', +]; diff --git a/resources/lang/it/token.php b/resources/lang/it/token.php index c4afdad9..2ae88593 100644 --- a/resources/lang/it/token.php +++ b/resources/lang/it/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'Il token è stato creato con successo, questi dati vengono visualizzati solo una volta, si prega di salvarli correttamente

:token', 'last_used_at' => 'Tempo di utilizzo recente', 'token' => 'summary', + "permission_not_allowed" => "Permesso::permission_text non consentito" ); diff --git a/resources/lang/ja/admin.php b/resources/lang/ja/admin.php index 2d77f7a1..aa657986 100644 --- a/resources/lang/ja/admin.php +++ b/resources/lang/ja/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => '認証プロバイダー', 'queue_monitor' => 'キューモニター', 'user_modify_logs' => 'ユーザーの変更ログ', + 'message_templates' => 'メッセージ・テンプレート', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/ja/label.php b/resources/lang/ja/label.php index 8acf4abb..71f3c1b9 100644 --- a/resources/lang/ja/label.php +++ b/resources/lang/ja/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => '最後に作成', 'text_quote' => '引用', 'text_code' => "コード", + 'language' => '言語', + 'content' => 'コンテンツ', 'setting' => [ 'nav_text' => '設定', 'backup' => [ diff --git a/resources/lang/ja/message-template.php b/resources/lang/ja/message-template.php new file mode 100644 index 00000000..0550ae75 --- /dev/null +++ b/resources/lang/ja/message-template.php @@ -0,0 +1,6 @@ + 'ここではBBCodeタグコードと次のプレースホルダを使用できます', + 'register_welcome' => '登録成功歓迎メッセージ', + 'register_welcome_content_help' => ':username => username', +]; diff --git a/resources/lang/ja/token.php b/resources/lang/ja/token.php index 13d3c660..07ab942b 100644 --- a/resources/lang/ja/token.php +++ b/resources/lang/ja/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'The token was created successfully, this data is displayed only once, please save it properly

:token', 'last_used_at' => '最近の使用時間', 'token' => 'summary', + "permission_not_allowed" => "パーミッション::permission_text は許可されていません" ); diff --git a/resources/lang/nb/admin.php b/resources/lang/nb/admin.php index 7240b8fa..c740ad64 100644 --- a/resources/lang/nb/admin.php +++ b/resources/lang/nb/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Autorisasjons leverandør', 'queue_monitor' => 'Overvåk av kø', 'user_modify_logs' => 'Bruker modifiserer logger', + 'message_templates' => 'Melding maler', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/nb/label.php b/resources/lang/nb/label.php index 877f8478..1bd06c03 100644 --- a/resources/lang/nb/label.php +++ b/resources/lang/nb/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Opprettet på slutten', 'text_quote' => 'Sitat', 'text_code' => "KODE", + 'language' => 'Språk', + 'content' => 'Innhold', 'setting' => [ 'nav_text' => 'Innstilling', 'backup' => [ diff --git a/resources/lang/nb/message-template.php b/resources/lang/nb/message-template.php new file mode 100644 index 00000000..7d497f69 --- /dev/null +++ b/resources/lang/nb/message-template.php @@ -0,0 +1,6 @@ + 'Her kan du bruke BBCode koder og følgende plassholdere', + 'register_welcome' => 'Registrering suksessfull velkomstmelding', + 'register_welcome_content_help' => ':username => brukernavn', +]; diff --git a/resources/lang/nb/token.php b/resources/lang/nb/token.php index e08d7ce4..7cf2bd7a 100644 --- a/resources/lang/nb/token.php +++ b/resources/lang/nb/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'Tokenet ble opprettet vellykket, disse dataene vises kun én gang, vennligst lagre det riktig

:token', 'last_used_at' => 'Nylig brukstid', 'token' => 'summary', + "permission_not_allowed" => "Tillatelse::permission_text ikke tillatt" ); diff --git a/resources/lang/nl/admin.php b/resources/lang/nl/admin.php index 03f4d92a..e22db652 100644 --- a/resources/lang/nl/admin.php +++ b/resources/lang/nl/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Autorisatie provider', 'queue_monitor' => 'Wachtrij monitor', 'user_modify_logs' => 'Gebruiker wijzigt logs', + 'message_templates' => 'Bericht sjabloon', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/nl/label.php b/resources/lang/nl/label.php index bfa2d13a..13645217 100644 --- a/resources/lang/nl/label.php +++ b/resources/lang/nl/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Aan het eind aangemaakt', 'text_quote' => 'Offerte', 'text_code' => "CODE", + 'language' => 'Taal', + 'content' => 'Inhoud', 'setting' => [ 'nav_text' => 'Instellingen', 'backup' => [ diff --git a/resources/lang/nl/message-template.php b/resources/lang/nl/message-template.php new file mode 100644 index 00000000..f72db4ae --- /dev/null +++ b/resources/lang/nl/message-template.php @@ -0,0 +1,6 @@ + 'Hier kunt u BBCode tag codes en de volgende placeholders gebruiken', + 'register_welcome' => 'Registratie succesvol welkomstbericht', + 'register_welcome_content_help' => ':username => gebruikersnaam', +]; diff --git a/resources/lang/nl/token.php b/resources/lang/nl/token.php index 123e4cf5..ce459119 100644 --- a/resources/lang/nl/token.php +++ b/resources/lang/nl/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'De token is succesvol aangemaakt. Deze gegevens worden slechts eenmaal weergegeven, gelieve het goed op te slaan

:token', 'last_used_at' => 'Recente gebruikstijd', 'token' => 'summary', + "permission_not_allowed" => "Machtiging::permission_text niet toegestaan" ); diff --git a/resources/lang/pl/admin.php b/resources/lang/pl/admin.php index 1e3b4977..f571b72d 100644 --- a/resources/lang/pl/admin.php +++ b/resources/lang/pl/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Dostawca autoryzacji', 'queue_monitor' => 'Monitor kolejki', 'user_modify_logs' => 'Logi modyfikacji użytkownika', + 'message_templates' => 'Szablony wiadomości', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/pl/label.php b/resources/lang/pl/label.php index c276e601..0ca8aa1d 100644 --- a/resources/lang/pl/label.php +++ b/resources/lang/pl/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Utworzono na końcu', 'text_quote' => 'Oferta', 'text_code' => "KOD", + 'language' => 'Język', + 'content' => 'Zawartość', 'setting' => [ 'nav_text' => 'Ustawienie', 'backup' => [ diff --git a/resources/lang/pl/message-template.php b/resources/lang/pl/message-template.php new file mode 100644 index 00000000..97aa4b59 --- /dev/null +++ b/resources/lang/pl/message-template.php @@ -0,0 +1,6 @@ + 'Tutaj możesz użyć kodów tagów BBCode i następujących symboli zastępczych', + 'register_welcome' => 'Wiadomość powitalna o pomyślnej rejestracji', + 'register_welcome_content_help' => 'Nazwa użytkownika :username =>', +]; diff --git a/resources/lang/pl/token.php b/resources/lang/pl/token.php index 43f6d19e..2eda797d 100644 --- a/resources/lang/pl/token.php +++ b/resources/lang/pl/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'Token został utworzony pomyślnie, te dane są wyświetlane tylko raz, proszę zapisać je poprawnie

:token', 'last_used_at' => 'Czas ostatniego użycia', 'token' => 'summary', + "permission_not_allowed" => "Zezwolenie::permission_text niedozwolone" ); diff --git a/resources/lang/pt/admin.php b/resources/lang/pt/admin.php index 1aead1d3..83f57b89 100644 --- a/resources/lang/pt/admin.php +++ b/resources/lang/pt/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Provedor de autorização', 'queue_monitor' => 'Monitor de fila', 'user_modify_logs' => 'Modificação de logs do usuário', + 'message_templates' => 'Modelos de mensagem', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/pt/label.php b/resources/lang/pt/label.php index 35c378d4..5fde55c1 100644 --- a/resources/lang/pt/label.php +++ b/resources/lang/pt/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Criado no final', 'text_quote' => 'Cotação', 'text_code' => "CÓDIGO", + 'language' => 'IDIOMA', + 'content' => 'Conteúdo', 'setting' => [ 'nav_text' => 'Configuração', 'backup' => [ diff --git a/resources/lang/pt/message-template.php b/resources/lang/pt/message-template.php new file mode 100644 index 00000000..d99bb282 --- /dev/null +++ b/resources/lang/pt/message-template.php @@ -0,0 +1,6 @@ + 'Aqui você pode usar códigos de tag BBCode e os seguintes espaços reservados', + 'register_welcome' => 'Registrar mensagem de boas vindas', + 'register_welcome_content_help' => ':username => usuário', +]; diff --git a/resources/lang/pt/token.php b/resources/lang/pt/token.php index 5ba54aa8..ba02e7e7 100644 --- a/resources/lang/pt/token.php +++ b/resources/lang/pt/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'O token foi criado com sucesso, esses dados são exibidos apenas uma vez, por favor, salve-o corretamente

:token', 'last_used_at' => 'Tempo de uso recente', 'token' => 'summary', + "permission_not_allowed" => "Permissão::permission_text não permitido" ); diff --git a/resources/lang/ro/admin.php b/resources/lang/ro/admin.php index 88d0fc56..31ee45ff 100644 --- a/resources/lang/ro/admin.php +++ b/resources/lang/ro/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Furnizor de autorizare', 'queue_monitor' => 'Monitorul de coadă', 'user_modify_logs' => 'Jurnalele de modificare ale utilizatorului', + 'message_templates' => 'Şabloane de mesaje', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/ro/label.php b/resources/lang/ro/label.php index 1a7242fb..b825ac4b 100644 --- a/resources/lang/ro/label.php +++ b/resources/lang/ro/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Creat la sfârșit', 'text_quote' => 'Ofertă', 'text_code' => "COD", + 'language' => 'Limba', + 'content' => 'Conținut', 'setting' => [ 'nav_text' => 'Setare', 'backup' => [ diff --git a/resources/lang/ro/message-template.php b/resources/lang/ro/message-template.php new file mode 100644 index 00000000..d3b4bd4c --- /dev/null +++ b/resources/lang/ro/message-template.php @@ -0,0 +1,6 @@ + 'Aici puteţi utiliza codurile de etichete BBCode şi următorii substituenţi', + 'register_welcome' => 'Mesaj de bun venit cu succes inregistrare', + 'register_welcome_content_help' => ':username => nume utilizator', +]; diff --git a/resources/lang/ro/token.php b/resources/lang/ro/token.php index 5fa5d139..c79c93ae 100644 --- a/resources/lang/ro/token.php +++ b/resources/lang/ro/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'Token-ul a fost creat cu succes, aceste date sunt afișate o singură dată, vă rugăm să salvați corect

:token', 'last_used_at' => 'Timp de utilizare recent', 'token' => 'summary', + "permission_not_allowed" => "Permisiunea::permission_text nu este permisă" ); diff --git a/resources/lang/ru/admin.php b/resources/lang/ru/admin.php index d869c825..9f436e9f 100644 --- a/resources/lang/ru/admin.php +++ b/resources/lang/ru/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Провайдер авторизации', 'queue_monitor' => 'Монитор очереди', 'user_modify_logs' => 'Изменение журналов', + 'message_templates' => 'Шаблоны сообщений', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/ru/label.php b/resources/lang/ru/label.php index bb7e5f90..fe3b7c82 100644 --- a/resources/lang/ru/label.php +++ b/resources/lang/ru/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Создано в конце', 'text_quote' => 'Цитата', 'text_code' => "КОД", + 'language' => 'Язык', + 'content' => 'Содержание', 'setting' => [ 'nav_text' => 'Настройка', 'backup' => [ diff --git a/resources/lang/ru/message-template.php b/resources/lang/ru/message-template.php new file mode 100644 index 00000000..09d1373c --- /dev/null +++ b/resources/lang/ru/message-template.php @@ -0,0 +1,6 @@ + 'Здесь вы можете использовать коды тегов BBCode и следующие заполнители', + 'register_welcome' => 'Приветственное сообщение о регистрации успешно отправлено', + 'register_welcome_content_help' => 'Имя пользователя', +]; diff --git a/resources/lang/ru/token.php b/resources/lang/ru/token.php index a3800f2c..c4942391 100644 --- a/resources/lang/ru/token.php +++ b/resources/lang/ru/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'Токен был успешно создан, эти данные отображаются только один раз, пожалуйста, сохраните их правильно

:token', 'last_used_at' => 'Время последнего использования', 'token' => 'summary', + "permission_not_allowed" => "Разрешение::permission_text не допускается" ); diff --git a/resources/lang/sv/admin.php b/resources/lang/sv/admin.php index 409fc2d9..c17256ed 100644 --- a/resources/lang/sv/admin.php +++ b/resources/lang/sv/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => 'Tillstånd leverantör', 'queue_monitor' => 'Kö monitor', 'user_modify_logs' => 'Användare ändra loggar', + 'message_templates' => 'Mallar för meddelande', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/sv/label.php b/resources/lang/sv/label.php index 717566e6..f8c645c0 100644 --- a/resources/lang/sv/label.php +++ b/resources/lang/sv/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => 'Skapad vid slutet', 'text_quote' => 'Offert', 'text_code' => "Kod", + 'language' => 'Språk', + 'content' => 'Innehåll', 'setting' => [ 'nav_text' => 'Inställning', 'backup' => [ diff --git a/resources/lang/sv/message-template.php b/resources/lang/sv/message-template.php new file mode 100644 index 00000000..68c4ea2d --- /dev/null +++ b/resources/lang/sv/message-template.php @@ -0,0 +1,6 @@ + 'Här kan du använda BBCode etikettkoder och följande platshållare', + 'register_welcome' => 'Välkomstmeddelande för registrering lyckades', + 'register_welcome_content_help' => ':username => användarnamn', +]; diff --git a/resources/lang/sv/token.php b/resources/lang/sv/token.php index 68625d77..c6a83232 100644 --- a/resources/lang/sv/token.php +++ b/resources/lang/sv/token.php @@ -7,4 +7,5 @@ return array ( 'create_success_tip' => 'Token skapades framgångsrikt, denna data visas bara en gång, vänligen spara den ordentligt

:token', 'last_used_at' => 'Senaste användningstid', 'token' => 'summary', + "permission_not_allowed" => "Behörighet::permission_text tillåts inte" ); diff --git a/resources/lang/zh_CN/admin.php b/resources/lang/zh_CN/admin.php index 2761079d..8e8d9f1a 100644 --- a/resources/lang/zh_CN/admin.php +++ b/resources/lang/zh_CN/admin.php @@ -44,6 +44,7 @@ return [ 'oauth_provider' => '身份验证', 'queue_monitor' => '队列监控', 'user_modify_logs' => '修改记录', + 'message_templates' => '消息模板', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/zh_CN/label.php b/resources/lang/zh_CN/label.php index 3cfe0f27..6cdd7fcb 100644 --- a/resources/lang/zh_CN/label.php +++ b/resources/lang/zh_CN/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => '创建时间结束', 'text_quote' => '引用', 'text_code' => "代码", + 'language' => '语言', + 'content' => '内容', 'setting' => [ 'nav_text' => '设置', 'backup' => [ diff --git a/resources/lang/zh_CN/message-template.php b/resources/lang/zh_CN/message-template.php new file mode 100644 index 00000000..8a25dcf2 --- /dev/null +++ b/resources/lang/zh_CN/message-template.php @@ -0,0 +1,6 @@ + '在这里你可以使用 BBCode 标签代码,以及以下占位符', + 'register_welcome' => '注册成功欢迎信息', + 'register_welcome_content_help' => ':username => 用户名', +]; diff --git a/resources/lang/zh_TW/admin.php b/resources/lang/zh_TW/admin.php index 1afd47b4..52427cc1 100644 --- a/resources/lang/zh_TW/admin.php +++ b/resources/lang/zh_TW/admin.php @@ -46,6 +46,7 @@ return [ 'oauth_provider' => '身份驗證', 'queue_monitor' => '隊列監控', 'user_modify_logs' => '修改記錄', + 'message_templates' => '消息模板', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/zh_TW/label.php b/resources/lang/zh_TW/label.php index 3f11edd1..2a64db3f 100644 --- a/resources/lang/zh_TW/label.php +++ b/resources/lang/zh_TW/label.php @@ -46,6 +46,8 @@ return [ 'created_at_end' => '創建時間結束', 'text_quote' => '引用', 'text_code' => "代碼", + 'language' => '語言', + 'content' => '內容', 'setting' => [ 'nav_text' => '設置', 'backup' => [ diff --git a/resources/lang/zh_TW/message-template.php b/resources/lang/zh_TW/message-template.php new file mode 100644 index 00000000..fc7d8ec7 --- /dev/null +++ b/resources/lang/zh_TW/message-template.php @@ -0,0 +1,6 @@ + '在這裏你可以使用 BBCode 標籤代碼,以及以下佔位符', + 'register_welcome' => '注冊成功歡迎信息', + 'register_welcome_content_help' => ':username => 用戶名', +];