mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-03 20:53:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix tag management translation (#3292)

Browse Source 
Before, feedback messages were not translated.
Now, they are.
This commit is contained in:
Alexis Degrugillier
2020-12-28 07:08:38 -05:00
committed by GitHub
parent 6ecfc01c1f
commit e93675e036
18 changed files with 98 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Controllers/tagController.php
View File

@@ -92,10 +92,10 @@ class FreshRSS_tag_Controller extends Minz_ActionController {
$tagDAO = FreshRSS_Factory::createTagDao();
if (null === $tagDAO->searchByName($name)) {
$tagDAO->addTag(['name' => $name]);
Minz_Request::good('feedback.tag.created', ['c' => 'tag', 'a' => 'index'], true);
Minz_Request::good(_t('feedback.tag.created', $name), ['c' => 'tag', 'a' => 'index'], true);
}
Minz_Request::bad('feedback.tag.name_exists', ['c' => 'tag', 'a' => 'index'], true);
Minz_Request::bad(_t('feedback.tag.name_exists', $name), ['c' => 'tag', 'a' => 'index'], true);
}
public function renameAction() {
@@ -103,17 +103,21 @@ class FreshRSS_tag_Controller extends Minz_ActionController {
Minz_Error::error(405);
}
$name = Minz_Request::param('name');
$targetName = Minz_Request::param('name');
$sourceId = Minz_Request::param('id_tag');
$tagDAO = FreshRSS_Factory::createTagDao();
$newTag = $tagDAO->searchByName($name);
if (null === $newTag) {
$tagDAO->updateTag(Minz_Request::param('id_tag'), ['name' => $name]);
$sourceName = $tagDAO->searchById($sourceId)->name();
$targetTag = $tagDAO->searchByName($targetName);
if (null === $targetTag) {
$tagDAO->updateTag($sourceId, ['name' => $targetName]);
} else {
$tagDAO->updateEntryTag(Minz_Request::param('id_tag'), $newTag->id());
$tagDAO->deleteTag(Minz_Request::param('id_tag'));
$tagDAO->updateEntryTag($sourceId, $targetTag->id());
$tagDAO->deleteTag($sourceId);
}
Minz_Request::good('feedback.tag.renamed', ['c' => 'tag', 'a' => 'index'], true);
Minz_Request::good(_t('feedback.tag.renamed', $sourceName, $targetName), ['c' => 'tag', 'a' => 'index'], true);
}
public function indexAction() {

5
app/i18n/cz/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Vyprázdněno (smazáno %d článků)',
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS bude nyní upgradováno na <strong>verzi %s</strong>.',
'error' => 'Během upgrade došlo k chybě: %s',

5
app/i18n/de/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Bereinigung abgeschlossen (%d Artikel gelöscht)',
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS wird nun auf die <strong>Version %s</strong> aktualisiert.',
'error' => 'Der Aktualisierungsvorgang stieß auf einen Fehler: %s',

5
app/i18n/en-us/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Purge completed (%d articles deleted)',
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS will now be updated to the <strong>version %s</strong>.',
'error' => 'The update process has encountered an error: %s',

5
app/i18n/en/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Purge completed (%d articles deleted)',
),
'tag' => array(
'created' => 'Tag "%s" has been created.',
'name_exists' => 'Tag name already exists.',
'renamed' => 'Tag "%s" has been renamed to "%s".',
),
'update' => array(
'can_apply' => 'FreshRSS will now be updated to the <strong>version %s</strong>.',
'error' => 'The update process has encountered an error: %s',

5
app/i18n/es/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Limpieza completada (se han eliminado %d artículos)',
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS se va a actualizar a la <strong>versión %s</strong>.',
'error' => 'Hubo un error durante el proceso de actualización: %s',

5
app/i18n/fr/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Purge effectuée (%d articles supprimés).',
),
'tag' => array(
'created' => 'L’étiquette "%s" a été créée.',
'name_exists' => 'L’étiquette existe déjà.',
'renamed' => 'L’étiquette "%s" a été renommée en "%s".',
),
'update' => array(
'can_apply' => 'FreshRSS va maintenant être mis à jour vers la <strong>version %s</strong>.',
'error' => 'La mise à jour a rencontré un problème : %s',

5
app/i18n/he/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'הניקוי הושלם (%d מאמרים נמחקו)',
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS will be now updated to the <strong>version %s</strong>.',
'error' => 'תהליך העדכון נתקל בשגיאה: %s',

5
app/i18n/it/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Svecchiamento completato (%d articoli cancellati)',
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS verrà aggiornato alla <strong>versione %s</strong>.',
'error' => 'Il processo di aggiornamento ha riscontrato il seguente errore: %s',

5
app/i18n/kr/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => '삭제 완료 (%d 개의 글을 삭제했습니다)',
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS가 <strong>%s</strong> 버전으로 업데이트됩니다.',
'error' => '업데이트 과정에서 문제가 발생했습니다: %s',

5
app/i18n/nl/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Opschonen klaar (%d artikelen verwijderd)',
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS word nu vernieud naar <strong>versie %s</strong>.',
'error' => 'Het vernieuwingsproces kwam een fout tegen: %s',

5
app/i18n/oc/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Purga realizada (%s articles suprimits)',
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS es per èsser mes a jorn en <strong>version %s</strong>.',
'error' => 'La mesa a jorn a conegut un problèma : %s',

5
app/i18n/pl/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Purge completed (%d articles deleted)', // TODO - Translation
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS zostanie zaktualizowany do <strong>wersji %s</strong>.',
'error' => 'Proces aktualizacji napotkał błąd: %s',

5
app/i18n/pt-br/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Limpeza completa (%d artigos deletados)',
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'O FreshRSS será atualizado para a <strong>versão %s</strong>.',
'error' => 'O processo de atualização encontrou um erro: %s',

5
app/i18n/ru/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Purge completed (%d articles deleted)', // TODO - Translation
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS will now be updated to the <strong>version %s</strong>.', // TODO - Translation
'error' => 'The update process has encountered an error: %s', // TODO - Translation

5
app/i18n/sk/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Čistenie ukončené. Počet vymazaných článkov: %d',
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS sa teraz aktualizuje <strong>na verziu %s</strong>.',
'error' => 'Počas aktualizácie sa vyskytla chyba: %s',

5
app/i18n/tr/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => 'Temizleme tamamlandı (%d makale silindi)',
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS <strong>%s versiyonuna</strong> güncellenecek.',
'error' => 'Güncelleme işlemi sırasında hata: %s',

5
app/i18n/zh-cn/feedback.php
View File

@@ -109,6 +109,11 @@ return array(
),
'purge_completed' => '清除完成（已删除 %d 篇文章）',
),
'tag' => array(
'created' => 'Tag "%s" has been created.', // TODO - Translation
'name_exists' => 'Tag name already exists.', // TODO - Translation
'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
),
'update' => array(
'can_apply' => 'FreshRSS 将更新到 <strong>版本 %s</strong>.',
'error' => '更新出错：%s',