From a1d509ccf9d77c631a69de4b50494dc58db31a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jer=C3=B4me=20Bakker?= Date: Mon, 15 Apr 2024 14:27:13 +0200 Subject: [PATCH 1/2] chore(i18n): update Transifex config to support Elgg 6.0 --- .tx/config | 80 ++++++++++----------- engine/classes/Elgg/I18n/ReleaseCleaner.php | 9 ++- 2 files changed, 48 insertions(+), 41 deletions(-) diff --git a/.tx/config b/.tx/config index ef56337741c..8c6dcaf5485 100644 --- a/.tx/config +++ b/.tx/config @@ -2,241 +2,241 @@ host = https://www.transifex.com lang_map = pt_BR: pt_br, ro_RO: ro_ro, zh-Hans: zh_hans -[o:elgg:p:elgg-core-5:r:engine] +[o:elgg:p:elgg-core-6:r:engine] file_filter = languages/.php source_file = languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:install] +[o:elgg:p:elgg-core-6:r:install] file_filter = install/languages/.php source_file = install/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:activity] +[o:elgg:p:elgg-core-6:r:activity] file_filter = mod/activity/languages/.php source_file = mod/activity/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:blog] +[o:elgg:p:elgg-core-6:r:blog] file_filter = mod/blog/languages/.php source_file = mod/blog/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:bookmarks] +[o:elgg:p:elgg-core-6:r:bookmarks] file_filter = mod/bookmarks/languages/.php source_file = mod/bookmarks/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:ckeditor] +[o:elgg:p:elgg-core-6:r:ckeditor] file_filter = mod/ckeditor/languages/.php source_file = mod/ckeditor/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:custom_index] +[o:elgg:p:elgg-core-6:r:custom_index] file_filter = mod/custom_index/languages/.php source_file = mod/custom_index/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:developers] +[o:elgg:p:elgg-core-6:r:developers] file_filter = mod/developers/languages/.php source_file = mod/developers/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:discussions] +[o:elgg:p:elgg-core-6:r:discussions] file_filter = mod/discussions/languages/.php source_file = mod/discussions/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:externalpages] +[o:elgg:p:elgg-core-6:r:externalpages] file_filter = mod/externalpages/languages/.php source_file = mod/externalpages/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:file] +[o:elgg:p:elgg-core-6:r:file] file_filter = mod/file/languages/.php source_file = mod/file/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:friends] +[o:elgg:p:elgg-core-6:r:friends] file_filter = mod/friends/languages/.php source_file = mod/friends/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:friends_collections] +[o:elgg:p:elgg-core-6:r:friends_collections] file_filter = mod/friends_collections/languages/.php source_file = mod/friends_collections/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:garbagecollector] +[o:elgg:p:elgg-core-6:r:garbagecollector] file_filter = mod/garbagecollector/languages/.php source_file = mod/garbagecollector/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:groups] +[o:elgg:p:elgg-core-6:r:groups] file_filter = mod/groups/languages/.php source_file = mod/groups/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:invitefriends] +[o:elgg:p:elgg-core-6:r:invitefriends] file_filter = mod/invitefriends/languages/.php source_file = mod/invitefriends/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:likes] +[o:elgg:p:elgg-core-6:r:likes] file_filter = mod/likes/languages/.php source_file = mod/likes/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:members] +[o:elgg:p:elgg-core-6:r:members] file_filter = mod/members/languages/.php source_file = mod/members/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:messageboard] +[o:elgg:p:elgg-core-6:r:messageboard] file_filter = mod/messageboard/languages/.php source_file = mod/messageboard/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:messages] +[o:elgg:p:elgg-core-6:r:messages] file_filter = mod/messages/languages/.php source_file = mod/messages/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:pages] +[o:elgg:p:elgg-core-6:r:pages] file_filter = mod/pages/languages/.php source_file = mod/pages/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:profile] +[o:elgg:p:elgg-core-6:r:profile] file_filter = mod/profile/languages/.php source_file = mod/profile/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:reportedcontent] +[o:elgg:p:elgg-core-6:r:reportedcontent] file_filter = mod/reportedcontent/languages/.php source_file = mod/reportedcontent/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:search] +[o:elgg:p:elgg-core-6:r:search] file_filter = mod/search/languages/.php source_file = mod/search/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:site_notifications] +[o:elgg:p:elgg-core-6:r:site_notifications] file_filter = mod/site_notifications/languages/.php source_file = mod/site_notifications/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:system_log] +[o:elgg:p:elgg-core-6:r:system_log] file_filter = mod/system_log/languages/.php source_file = mod/system_log/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:tagcloud] +[o:elgg:p:elgg-core-6:r:tagcloud] file_filter = mod/tagcloud/languages/.php source_file = mod/tagcloud/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:theme_sandbox] +[o:elgg:p:elgg-core-6:r:theme_sandbox] file_filter = mod/theme_sandbox/languages/.php source_file = mod/theme_sandbox/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:thewire] +[o:elgg:p:elgg-core-6:r:thewire] file_filter = mod/thewire/languages/.php source_file = mod/thewire/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:uservalidationbyemail] +[o:elgg:p:elgg-core-6:r:uservalidationbyemail] file_filter = mod/uservalidationbyemail/languages/.php source_file = mod/uservalidationbyemail/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:web_services] +[o:elgg:p:elgg-core-6:r:web_services] file_filter = mod/web_services/languages/.php source_file = mod/web_services/languages/en.php source_lang = en type = PHP_ARRAY -[o:elgg:p:elgg-core-5:r:docs-index] +[o:elgg:p:elgg-core-6:r:docs-index] file_filter = docs/locale//LC_MESSAGES/index.po source_file = docs/locale/pot/index.pot source_lang = en type = PO -[o:elgg:p:elgg-core-5:r:docs-admin] +[o:elgg:p:elgg-core-6:r:docs-admin] file_filter = docs/locale//LC_MESSAGES/admin.po source_file = docs/locale/pot/admin.pot source_lang = en type = PO -[o:elgg:p:elgg-core-5:r:docs-appendix] +[o:elgg:p:elgg-core-6:r:docs-appendix] file_filter = docs/locale//LC_MESSAGES/appendix.po source_file = docs/locale/pot/appendix.pot source_lang = en type = PO -[o:elgg:p:elgg-core-5:r:docs-contribute] +[o:elgg:p:elgg-core-6:r:docs-contribute] file_filter = docs/locale//LC_MESSAGES/contribute.po source_file = docs/locale/pot/contribute.pot source_lang = en type = PO -[o:elgg:p:elgg-core-5:r:docs-design] +[o:elgg:p:elgg-core-6:r:docs-design] file_filter = docs/locale//LC_MESSAGES/design.po source_file = docs/locale/pot/design.pot source_lang = en type = PO -[o:elgg:p:elgg-core-5:r:docs-guides] +[o:elgg:p:elgg-core-6:r:docs-guides] file_filter = docs/locale//LC_MESSAGES/guides.po source_file = docs/locale/pot/guides.pot source_lang = en type = PO -[o:elgg:p:elgg-core-5:r:docs-intro] +[o:elgg:p:elgg-core-6:r:docs-intro] file_filter = docs/locale//LC_MESSAGES/intro.po source_file = docs/locale/pot/intro.pot source_lang = en type = PO -[o:elgg:p:elgg-core-5:r:docs-plugins] +[o:elgg:p:elgg-core-6:r:docs-plugins] file_filter = docs/locale//LC_MESSAGES/plugins.po source_file = docs/locale/pot/plugins.pot source_lang = en type = PO -[o:elgg:p:elgg-core-5:r:docs-tutorials] +[o:elgg:p:elgg-core-6:r:docs-tutorials] file_filter = docs/locale//LC_MESSAGES/tutorials.po source_file = docs/locale/pot/tutorials.pot source_lang = en diff --git a/engine/classes/Elgg/I18n/ReleaseCleaner.php b/engine/classes/Elgg/I18n/ReleaseCleaner.php index 820f678f876..485e05ee09f 100644 --- a/engine/classes/Elgg/I18n/ReleaseCleaner.php +++ b/engine/classes/Elgg/I18n/ReleaseCleaner.php @@ -180,7 +180,14 @@ protected function cleanupEmptyTranslations(string $translation_file): void { // something was changed file_put_contents($translation_file, $contents); - $this->log[] = "Cleaned empty translations from {$translation_file}"; + $translations = Includer::includeFile($translation_file); + if (!empty($translations)) { + $this->log[] = "Cleaned empty translations from {$translation_file}"; + } else { + unlink($translation_file); + + $this->log[] = "Removed empty translation file {$translation_file}"; + } } } From 7a9c3f4f6d3b0401885f890794e561605363ae8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jer=C3=B4me=20Bakker?= Date: Mon, 15 Apr 2024 14:47:59 +0200 Subject: [PATCH 2/2] chore(i18n): remove unused language keys --- mod/developers/languages/en.php | 2 -- mod/site_notifications/languages/en.php | 3 --- mod/thewire/languages/en.php | 2 -- 3 files changed, 7 deletions(-) diff --git a/mod/developers/languages/en.php b/mod/developers/languages/en.php index 6a983296b2b..36394527d3d 100644 --- a/mod/developers/languages/en.php +++ b/mod/developers/languages/en.php @@ -60,7 +60,6 @@ // entity explorer 'developers:entity_explorer:help' => 'View information about entities and perform some basic actions on them.', 'developers:entity_explorer:guid:label' => 'Enter the guid of the entity to inspect', - 'developers:entity_explorer:info' => 'Entity Information', 'developers:entity_explorer:info:attributes' => 'Attributes', 'developers:entity_explorer:info:metadata' => 'Metadata', 'developers:entity_explorer:info:relationships' => 'Relationships', @@ -71,7 +70,6 @@ 'developers:entity_explorer:view_entity' => 'View this entity on the site', // inspection - 'developers:inspect:help' => 'Inspect configuration of the Elgg framework.', 'developers:inspect:actions' => 'Actions', 'developers:inspect:events' => 'Events', 'developers:inspect:menus' => 'Menus', diff --git a/mod/site_notifications/languages/en.php b/mod/site_notifications/languages/en.php index e864e5cf97c..9c50ffe0456 100644 --- a/mod/site_notifications/languages/en.php +++ b/mod/site_notifications/languages/en.php @@ -33,10 +33,7 @@ 'site_notifications:success:delete' => 'Notifications deleted', 'site_notifications:success:mark_read' => 'Notifications marked as read', - 'site_notifications:cron:linked_cleanup:start' => 'Site notifications cleaning up notifications without linked entities', 'site_notifications:cron:linked_cleanup:end' => 'Site notifications cleaned up %s notifications without linked entities', - 'site_notifications:cron:unread_cleanup:start' => 'Site notifications cleaning up unread notifications older than %s days', 'site_notifications:cron:unread_cleanup:end' => 'Site notifications cleaned up %s unread notifications', - 'site_notifications:cron:read_cleanup:start' => 'Site notifications cleaning up read notifications older than %s days', 'site_notifications:cron:read_cleanup:end' => 'Site notifications cleaned up %s read notifications', ); diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php index 58ef6452ad3..13e74d59ec0 100644 --- a/mod/thewire/languages/en.php +++ b/mod/thewire/languages/en.php @@ -51,10 +51,8 @@ * Status messages */ 'thewire:posted' => "Your message was successfully posted to the wire.", - 'thewire:deleted' => "The wire post was successfully deleted.", 'thewire:blank' => "Sorry, you need to enter some text before we can post this.", 'thewire:notsaved' => "Sorry. We could not save this wire post.", - 'thewire:notdeleted' => "Sorry. We could not delete this wire post.", /** * Notifications