Skip to content

Commit

Permalink
Fixed placeholders in translations (#751)
Browse files Browse the repository at this point in the history
* Fixed placeholders in translations

* Corrected PR number in changelog

* Updated test output to new year 2024
  • Loading branch information
hbugdoll authored Jan 9, 2024
1 parent 7514b27 commit aa77beb
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 17 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ In order to read more about upgrading and BC breaks have a look at the [UPGRADE

+ [#748](https://github.com/luyadev/luya-module-admin/pull/748) Do not clean up user lockouts when the user is an API-based user. This will enhance the performance for API user requests.
+ [#749](https://github.com/luyadev/luya-module-admin/pull/749) Added a new property, `luya\admin\Module::$apiUserTrackLastActivity`, which controls the update of the last activity timestamp for API users. By default, this feature is enabled to maintain backward compatibility. For larger systems, disabling this property can prevent unnecessary database writes.
+ [#751](https://github.com/luyadev/luya-module-admin/pull/751) Fixed parameter placeholders in translations (hu, nl, pl).

## 5.0.0 (30. November 2023)

Expand Down
18 changes: 9 additions & 9 deletions src/messages/hu/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,12 @@
'aw_apioverview_no_access_token' => 'Az API-felhasználónak hozzáférési jogkivonattal kell rendelkeznie az API eléréséhez.',

// added translations in version 1.1.1:
'ngrest_crud_total_count' => '{{data.Listarray.length}} {{totalrows}}}',
'ngrest_crud_total_count' => '{{data.listArray.length}} {{totalRows}}}',

// added translations in version 1.2.0:
'login_async_submission_limit_reached' => 'Az űrlapküldések maximális száma elérte, próbálkozzon újra {time}.',
'model_loginform_max_user_attempts' => 'A bejelentkezési kísérletek maximális számát elérte, próbálkozzon újra {time}.',
'model_loginform_wrong_user_or_password_attempts' => 'Hibás e-mail vagy jelszó. Kísérlet # {kísérlet} a {AllowedAttempts}.',
'model_loginform_wrong_user_or_password_attempts' => 'Hibás e-mail vagy jelszó. Kísérlet # {attempt} a {allowedAttempts}.',
'model_user_login_attempt_lock_expiration' => 'Bejelentkezés lezárási ideje',
'account_changeemail_subject' => 'E-mail cím frissítésének ellenőrzése',
'account_changeemail_body' => 'Adja meg a következő ellenőrző kódot a webhely e-mail címének módosításához:',
Expand All @@ -336,7 +336,7 @@
'mode_user_personal_info' => 'Személyes adatok',
'settings_general' => 'Általános',
'settings_developer_mode' => 'Fejlesztői mód',
'layout_logout_minutes' => '{{idleTimereLative}} perc',
'layout_logout_minutes' => '{{idleTimeRelative}} perc',
'view_index_redirect_telephone' => 'telefonszám',
'view_index_redirect_telephone_help' => 'Kérjük, adjon meg egy érvényes telefonszámot (a „+” feliratnál a vezető „\\” szükséges).',
'missing_file_upload_permission' => 'Nem elegendő jogosultság a fájlok feltöltéséhez.',
Expand Down Expand Up @@ -375,7 +375,7 @@
'js_scheduler_table_newvalue' => 'Új érték',
'js_scheduler_table_timestamp' => 'Kivitelezési idő',
'js_dir_manager_rename_success' => 'A mappa átnevezése sikeresen megtörtént.',
'layout_filemanager_search_no_results' => 'Nem található fájl a <strong>(z) {{SearchQuery}}</strong>mappához.',
'layout_filemanager_search_no_results' => 'Nem található fájl a <strong>(z) {{searchQuery}}</strong>mappához.',
'layout_filemanager_empty_folder' => 'Ez a könyvtár nem tartalmaz fájlokat.',
'aw_requestinsight_warning' => 'Ezt a funkciót elsősorban egy adott API-ba való betekintésre használják. Nem ajánlott hosszú ideig engedélyezni, mivel sok adatot gyűjthet és lelassíthatja az alkalmazást.',
'aw_requestinsight_logger_active' => 'A lekérdezés Insight jelenleg aktív!',
Expand All @@ -391,7 +391,7 @@
'aw_requestinsight_col_count' => 'Count',
'aw_requestinsight_top_request_label' => 'Legnépszerűbb URL-ek',
'aw_requestinsight_longest_response_label' => 'A leghosszabb válaszidővel rendelkező URL-ek',
'aw_requestinsight_data_pagination' => '{{{data.length}}} kérések {{DataCount}}',
'aw_requestinsight_data_pagination' => '{{data.length}} kérések {{dataCount}}',
'aw_requestinsight_toggle_logger_enabled' => 'Az Insight engedélyezve van.',
'aw_requestinsight_toggle_logger_disabled' => 'Az Insight le van tiltva.',
'aw_requestinsight_toggle_error' => 'Hiba történt a Request Insight engedélyezése közben.',
Expand All @@ -416,8 +416,8 @@
// added translations in version 2.2.0:
'active_button_togglestatus_label' => 'Állapot be-',
'active_button_togglestatus_error' => 'Nem sikerült aktiválni',
'active_button_togglestatus_enabled' => '{ModelName} engedélyezve',
'active_button_togglestatus_disabled' => '{ModelName} letiltva',
'active_button_togglestatus_enabled' => '{modelName} engedélyezve',
'active_button_togglestatus_disabled' => '{modelName} letiltva',
'layout_filemanager_detail_details' => 'Fájl részletei',

// added translations in version 2.3.0:
Expand Down Expand Up @@ -450,7 +450,7 @@
'settings_devices_this' => 'Ez az eszköz',
'settings_2fa' => 'Kétlépéses hitelesítés (2FA)',
'settings_2fa_intro' => 'A kétlépéses hitelesítés biztosítja, hogy csak a jelszóval és a második tényezős eszközhöz hozzáféréssel rendelkező személyek tudjanak bejelentkezni. Minden alkalommal, amikor bejelentkezik, a rendszer kéri a kéttényezős kód megadását.',
'settings_2fa_backup_code_hint' => 'Tárolja a {{TwoFabackupCode}} biztonsági kódot biztonságos helyen, nem jelenik meg újra.',
'settings_2fa_backup_code_hint' => 'Tárolja a {{twoFaBackupCode}} biztonsági kódot biztonságos helyen, nem jelenik meg újra.',
'settings_2fa_success' => 'A kétlépéses hitelesítés sikeresen lett beállítva.',
'settings_2fa_step1' => 'A QR-kód beolvasása',
'settings_2fa_step2' => 'Írja be a kódot az alkalmazásból',
Expand Down Expand Up @@ -513,7 +513,7 @@
'user_model_email_deleted_account_exists' => 'A megadott e-mail címet egy törölt fiók már használja.',

// added translations in version 3.6.0:
'i18n_required_validator_invalid_format' => 'A megadott (z)\\ "{attribútum}\\” attribútumnak tömbtípusnak kell lennie.',
'i18n_required_validator_invalid_format' => 'A megadott (z)\\ "{attribute}\\” attribútumnak tömbtípusnak kell lennie.',
'i18n_required_validator_missing_key' => 'A (z)\\ "{lang}\\” nyelvi kulcs hiányzik, és szükséges.',
'i18n_required_validator_invalid_empty_value' => 'A (z)\\ "{lang}\\” nyelv értéke nem lehet üres.',
'crud_exportdata_col_filter' => 'Filter',
Expand Down
8 changes: 4 additions & 4 deletions src/messages/nl/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,9 @@
'ngrest_crud_total_count' => '{{data.listArray.length}} van {{totalRows}}',

// added translations in version 1.2.0:
'login_async_submission_limit_reached' => 'Het maximale aantal formulierinzendingen is bereikt, probeer het opnieuw {tijd}.',
'model_loginform_max_user_attempts' => 'Het maximum aantal inlogpogingen is bereikt, probeer het opnieuw {tijd}.',
'model_loginform_wrong_user_or_password_attempts' => 'Verkeerde e-mail of wachtwoord. Poging # {poging} van {allowedAttempts}.',
'login_async_submission_limit_reached' => 'Het maximale aantal formulierinzendingen is bereikt, probeer het opnieuw {time}.',
'model_loginform_max_user_attempts' => 'Het maximum aantal inlogpogingen is bereikt, probeer het opnieuw {time}.',
'model_loginform_wrong_user_or_password_attempts' => 'Verkeerde e-mail of wachtwoord. Poging # {attempt} van {allowedAttempts}.',
'model_user_login_attempt_lock_expiration' => 'Vergrendelingstijd voor inloggen',
'account_changeemail_subject' => 'Controleer update van uw e-mailadres',
'account_changeemail_body' => 'Voer de volgende verificatiecode in om uw e-mailadres voor de website te wijzigen:',
Expand All @@ -336,7 +336,7 @@
'mode_user_personal_info' => 'Persoonlijke info',
'settings_general' => 'Algemeen',
'settings_developer_mode' => 'Ontwikkelaarsmodus',
'layout_logout_minutes' => '{{IdleTimeRelative}} minuten',
'layout_logout_minutes' => '{{idleTimeRelative}} minuten',
'view_index_redirect_telephone' => 'telefoonnummer',
'view_index_redirect_telephone_help' => 'Voer een geldig telefoonnummer in (voor het teken "+" is een leidende "\" vereist).',
'missing_file_upload_permission' => 'Onvoldoende rechten voor bestandsuploads.',
Expand Down
6 changes: 3 additions & 3 deletions src/messages/pl/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,9 @@
// added translations in version 1.2.0:
'account_changeemail_body' => 'Wpisz następujący kod weryfikacyjny, aby zmienić adres e-mail dla witryny:',
'account_changeemail_enterverificationtoken' => 'Wprowadź kod weryfikacyjny wysłany do <b>{{profile.email}}</b> aby potwierdzić żądanie zmiany <b>{{settings.newUserEmail}}</b> change request.',
'login_async_submission_limit_reached' => 'Osiągnięto maksymalną liczbę zgłoszeń, spróbuj ponownie {czas}.',
'model_loginform_max_user_attempts' => 'Osiągnięto maksymalną liczbę prób logowania, spróbuj ponownie {czas}.',
'model_loginform_wrong_user_or_password_attempts' => 'Zły adres e-mail lub hasło. Próba # {próba} z {allowedAttempts}. ',
'login_async_submission_limit_reached' => 'Osiągnięto maksymalną liczbę zgłoszeń, spróbuj ponownie {time}.',
'model_loginform_max_user_attempts' => 'Osiągnięto maksymalną liczbę prób logowania, spróbuj ponownie {time}.',
'model_loginform_wrong_user_or_password_attempts' => 'Zły adres e-mail lub hasło. Próba # {attempt} z {allowedAttempts}. ',
'model_user_login_attempt_lock_expiration' => 'Czas blokady logowania',
'account_changeemail_subject' => 'Zweryfikuj aktualizację swojego adresu e-mail',
'account_changeemail_tokensenterror' => 'Nie można wysłać kodu weryfikacyjnego do {email}. Upewnij się, że komponent poczty jest poprawnie skonfigurowany. ',
Expand Down
2 changes: 1 addition & 1 deletion tests/admin/aws/UserHistorySummaryActiveWindowTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public function testRenderWithLogs()
$aws->ngRestModelClass = User::class;
$aws->setItemId(1);

$expect = '<script>zaa.bootstrap.register(\'UserHistorySummaryController\', [\'$scope\', function($scope) { $scope.pie = false; $scope.loadPieCharts = function() { $scope.$parent.sendActiveWindowCallback(\'pie\').then(function(response) { $scope.pie = response.data; }); }; $scope.loadPieCharts(); }]);</script><div class="row" ng-controller="UserHistorySummaryController"><div class="col-lg-3"><div class="card mb-4"><div class="card-header">Profile details</div><div class="table-responsive"><table class="table table-sm table-borderless table-striped small"><tr><td>Title</td><td>1</td></tr><tr><td>Name</td><td>Foo Bar</td></tr><tr><td>Email</td><td><a href="mailto:[email protected]">[email protected]</a></td></tr><tr><td>Removed</td><td>No</td></tr><tr><td>Groups</td><td></td></tr><tr><td>Last API activity</td><td>5/23/70, 9:21 PM</td></tr></table></div></div><div class="card mb-4"><div class="card-header">Total contributions</div><div class="card-body" ng-if="pie"><echarts id="userEchart" data="pie"></echarts></div></div><div class="card"><div class="card-header">Custom settings</div><div class="table-responsive"><table class="table table-sm table-borderless table-striped small"></table></div></div></div><div class="col-lg-3"><div class="card"><div class="card-header">Latest sessions</div><table class="table table-sm table-striped table-borderless table-hoverable small mb-0"></table></div></div><div class="col-lg-6"><div class="card"><div class="card-header">Change history</div><ul class="list-group list-group-flush"><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Updated">create</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>53 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement1=!hiddenElement1">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement1"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td colspan="3">No changes</td></tr></table></div></li><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Updated">create</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>53 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement2=!hiddenElement2">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement2"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td>foo</td><td>bar</td><td>baz</td></tr></table></div></li><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Added">add_box</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>53 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement3=!hiddenElement3">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement3"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td>foo</td><td>-</td><td>baz</td></tr></table></div></li><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Updated">create</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>53 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement4=!hiddenElement4">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement4"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td colspan="3">No changes</td></tr></table></div></li></ul></div></div></div>';
$expect = '<script>zaa.bootstrap.register(\'UserHistorySummaryController\', [\'$scope\', function($scope) { $scope.pie = false; $scope.loadPieCharts = function() { $scope.$parent.sendActiveWindowCallback(\'pie\').then(function(response) { $scope.pie = response.data; }); }; $scope.loadPieCharts(); }]);</script><div class="row" ng-controller="UserHistorySummaryController"><div class="col-lg-3"><div class="card mb-4"><div class="card-header">Profile details</div><div class="table-responsive"><table class="table table-sm table-borderless table-striped small"><tr><td>Title</td><td>1</td></tr><tr><td>Name</td><td>Foo Bar</td></tr><tr><td>Email</td><td><a href="mailto:[email protected]">[email protected]</a></td></tr><tr><td>Removed</td><td>No</td></tr><tr><td>Groups</td><td></td></tr><tr><td>Last API activity</td><td>5/23/70, 9:21 PM</td></tr></table></div></div><div class="card mb-4"><div class="card-header">Total contributions</div><div class="card-body" ng-if="pie"><echarts id="userEchart" data="pie"></echarts></div></div><div class="card"><div class="card-header">Custom settings</div><div class="table-responsive"><table class="table table-sm table-borderless table-striped small"></table></div></div></div><div class="col-lg-3"><div class="card"><div class="card-header">Latest sessions</div><table class="table table-sm table-striped table-borderless table-hoverable small mb-0"></table></div></div><div class="col-lg-6"><div class="card"><div class="card-header">Change history</div><ul class="list-group list-group-flush"><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Updated">create</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>54 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement1=!hiddenElement1">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement1"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td colspan="3">No changes</td></tr></table></div></li><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Updated">create</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>54 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement2=!hiddenElement2">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement2"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td>foo</td><td>bar</td><td>baz</td></tr></table></div></li><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Added">add_box</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>54 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement3=!hiddenElement3">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement3"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td>foo</td><td>-</td><td>baz</td></tr></table></div></li><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Updated">create</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>54 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement4=!hiddenElement4">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement4"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td colspan="3">No changes</td></tr></table></div></li></ul></div></div></div>';

$this->assertContainsTrimmed($expect, $aws->index());

Expand Down

0 comments on commit aa77beb

Please sign in to comment.