Move core language files into modules/Core

.github/CONTRIBUTING.md

@@ -79,7 +79,7 @@ Deprecations rule of thumb:
 After adding a new module to core, you need to do the following:
 1. Update the `Dockerfile.phpdoc` file to include the new module classes folder (this generates our [PHPDoc](https://phpdoc.namelessmc.com/) site)
 2. Update `composer.json` to autoload the new module classes folder
-3. Add a new term to the `custom/languages/en_UK.json` file for the module description to be shown during instal
+3. Add a new term to the `modules/Core/language/en_UK.json` file for the module description to be shown during instal
     - The term should be in the format `module_{module_name}_description`
     - Don't forget to add it to the `WHITELISTED_TERMS` array in `dev/scripts/find_unused_language_terms.sh`
 4. Create new database entry to install it by default

README.md

@@ -34,7 +34,7 @@ The following list is a brief summary of the features available in v2:
 - ✨ Pretty URL option (requires mod_rewrite or special nginx config).
 - 🎛 Widgets: allows modules to create widgets which can be displayed on most user-facing pages and display almost anything.
 - ⏳ Queue: schedule tasks to happen at a certain point in the future
-- 🚩 Translated into [over 20 languages](https://github.com/NamelessMC/Nameless/tree/v2/custom/languages)
+- 🚩 Translated into [over 20 languages](https://github.com/NamelessMC/Nameless/tree/v2/modules/Core/language)
 
 
 #### Customising Nameless

core/classes/Core/Language.php

@@ -199,7 +199,7 @@ public function __construct(string $module = 'core', string $active_language = n
 
         // Require file
         if ($module === 'core') {
-            $path = implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'custom', 'languages', '__lng__.json']);
+            $path = implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'modules', 'Core', 'language', '__lng__.json']);
         } else {
             $path = str_replace('/', DIRECTORY_SEPARATOR, $module) . DIRECTORY_SEPARATOR . '__lng__.json';
         }

core/installation/includes/header.php

@@ -2,7 +2,7 @@
 $readme = file(ROOT_PATH . '/README.md');
 $subheader = str_replace('#', '', $readme[0]);
 
-if (isset($_SESSION['installer_language']) && is_file('custom/languages/' . $_SESSION['installer_language'] . '.json')) {
+if (isset($_SESSION['installer_language']) && is_file('modules/Core/language/' . $_SESSION['installer_language'] . '.json')) {
     $installer_language = $_SESSION['installer_language'];
 } else {
     $installer_language = 'en_UK';

dev/scripts/delete_empty_language_strings.php

@@ -5,7 +5,7 @@
 }
 
 $language_files = glob('modules/*/language/*.json');
-$language_files = array_merge($language_files, glob('custom/languages/*.json'));
+$language_files = array_merge($language_files, glob('modules/Core/language/*.json'));
 
 foreach ($language_files as $language_file) {
     $modified = false;

dev/scripts/find_unused_language_terms.sh

@@ -7,7 +7,7 @@ fi
 
 UNUSED_TERMS_FOUND=false
 FILES=(
-  "custom/languages/en_UK.json"
+  "modules/Core/language/en_UK.json"
   "modules/Forum/language/en_UK.json"
   "modules/Cookie Consent/language/en_UK.json"
   "modules/Discord Integration/language/en_UK.json"

install.php

@@ -37,7 +37,7 @@
 // Select language
 if (
     isset($_SESSION['installer_language'])
-    && is_file('custom/languages/' . $_SESSION['installer_language'] . '.json')
+    && is_file('modules/Core/language/' . $_SESSION['installer_language'] . '.json')
 ) {
     $language_short_code = $_SESSION['installer_language'];
 } else {
@@ -57,7 +57,7 @@
 
 if (isset($_GET['language'])) {
     // Set language
-    if (is_file('custom/languages/' . $_GET['language'] . '.json')) {
+    if (is_file('modules/Core/language/' . $_GET['language'] . '.json')) {
         $_SESSION['installer_language'] = $_GET['language'];
         die('OK');
     }

custom/languages/cs_CZ.json → modules/Core/language/cs_CZ.json

@@ -1053,7 +1053,7 @@
     "admin/debug_link_toast": "{{linkStart}}Klikněte sem{{linkEnd}} pro zobrazení ladicího odkazu.",
     "admin/editing_integration_for_x": "Úprava integrace {{integration}} u uživatele {{user}}",
     "admin/editing_integration_x": "Úprava integrace {{integration}}",
-    "admin/email_language_info": "Nevidíte váš jazyk? Ujistěte se, že je jeho jazykový soubor v adresáři /custom/languages/ zapisovatelný vaším webovým serverem.",
+    "admin/email_language_info": "Nevidíte váš jazyk? Ujistěte se, že je jeho jazykový soubor v adresáři /modules/Core/language/ zapisovatelný vaším webovým serverem.",
     "admin/email_port": "Port",
     "admin/group_cloned_successfully": "Skupina úspěšně naklonována.",
     "admin/identifier": "Identifikátor",

custom/languages/da_DK.json → modules/Core/language/da_DK.json

@@ -652,7 +652,7 @@
     "admin/confirm_delete_page": "Er du sikker på, at du vil slette denne side?",
     "admin/confirm_group_deletion": "Er du sikker på, at du vil slette denne gruppe {{group}}?",
     "admin/creating_announcement": "Oprettelse af meddelelse",
-    "admin/email_language_info": "Kan du ikke se dit sprog? Sørg for, at dens sprogfil er skrivbar af din hjemmeside i /custom/languages/.",
+    "admin/email_language_info": "Kan du ikke se dit sprog? Sørg for, at dens sprogfil er skrivbar af din hjemmeside i /modules/Core/language/.",
     "admin/email_port_invalid": "Indsæt venligst en gyldig e-mail port.",
     "admin/emails_mass_message_loading": "Indlæser... Lad være med at genindlæse siden. Dette kan tage et stykke tid.",
     "admin/enable_minecraft_integration": "Vil du aktivere Minecraft-integration?",

custom/languages/de_DE.json → modules/Core/language/de_DE.json

@@ -1072,7 +1072,7 @@
     "admin/authme_db_password_hidden": "Das Passwort der AuthMe-Datenbank ist aus Sicherheitsgründen verborgen.",
     "admin/bedrock_help": "Wähle diese Option, wenn der Server ein Bedrock-Server ist.",
     "admin/can_unlink_integration": "Können Benutzer die Integration aufheben?",
-    "admin/email_language_info": "Du siehst deine Sprache nicht? Vergewisser dich, dass die Sprachdatei in /custom/languages/ für deinen Webserver schreibbar ist.",
+    "admin/email_language_info": "Du siehst deine Sprache nicht? Vergewisser dich, dass die Sprachdatei in /modules/Core/language/ für deinen Webserver schreibbar ist.",
     "admin/enable_placeholders": "Platzhalter aktivieren?",
     "admin/group_order": "Gruppen Sortiertung",
     "admin/integration": "Integration",

custom/languages/en_US.json → modules/Core/language/en_US.json

@@ -1080,7 +1080,7 @@
     "admin/can_unlink": "Can Unlink",
     "admin/can_unlink_integration": "Can users unlink integration?",
     "admin/editing_integration_x": "Editing integration {{integration}}",
-    "admin/email_language_info": "Not seeing your language? Make sure its language file is writable by your webserver in /custom/languages/.",
+    "admin/email_language_info": "Not seeing your language? Make sure its language file is writable by your webserver in /modules/Core/language/.",
     "admin/group_cloned_successfully": "Group cloned successfully.",
     "admin/integration": "Integration",
     "admin/integration_identifier": "{{integration}} Identifier",

custom/languages/es_ES.json → modules/Core/language/es_ES.json

@@ -1058,7 +1058,7 @@
     "admin/announcement_hook_info": "Creación de anuncios",
     "admin/can_unlink": "Puede desvincularse",
     "admin/can_unlink_integration": "¿Pueden los usuarios desvincularse de la integración?",
-    "admin/email_language_info": "¿No ve su idioma? Asegúrese de que su archivo de idioma es escribible por su servidor web en /custom/languages/.",
+    "admin/email_language_info": "¿No ve su idioma? Asegúrese de que su archivo de idioma es escribible por su servidor web en /modules/Core/language/.",
     "admin/identifier": "Identificador",
     "admin/integration_identifier_invalid": "El identificador {{integration}} no es válido.",
     "admin/integration_identifier_required": "Se requiere el identificador {{integration}}.",

custom/languages/fr_FR.json → modules/Core/language/fr_FR.json

@@ -957,7 +957,7 @@
     "admin/editing_integration_x": "Modification de l’intégration {{integration}}}",
     "admin/editing_language": "Édition du langage",
     "admin/editing_messages": "Édition du Message",
-    "admin/email_language_info": "Tu ne vois pas ton langage? Assurez-vous que son fichier de langue est en écriture par votre serveur web dans /custom/languages/ .",
+    "admin/email_language_info": "Tu ne vois pas ton langage? Assurez-vous que son fichier de langue est en écriture par votre serveur web dans /modules/Core/language/ .",
     "admin/email_logs": "Masse Emails",
     "admin/email_message_greeting": "Salutation",
     "admin/email_message_message": "Message",

custom/languages/hu_HU.json → modules/Core/language/hu_HU.json

@@ -310,7 +310,7 @@
     "admin/editing_profile_field": "Profil mező szerkesztése",
     "admin/editing_widget_x": "{{widget}} Widget szerkesztése",
     "admin/email_errors_purged_successfully": "E-mail hibák sikeresen törölve.",
-    "admin/email_language_info": "Nem látod a nyelved? Győződj meg arról, hogy a nyelvi fájl a webszerver által írható a /custom/languages/ mappában.",
+    "admin/email_language_info": "Nem látod a nyelved? Győződj meg arról, hogy a nyelvi fájl a webszerver által írható a /modules/Core/language/ mappában.",
     "admin/email_resent_successfully": "E-mail újraküldés sikeres.",
     "admin/enable_api": "API Engedélyezése?",
     "user/avatar_set_successfully": "Avatár beállítása sikeres.",

custom/languages/it_IT.json → modules/Core/language/it_IT.json

@@ -982,7 +982,7 @@
     "admin/bedrock": "Bedrock?",
     "user/group_has_been_added": "Il gruppo {{group}} è stato aggiunto all’utente {{user}}",
     "user/group_has_been_removed": "Il gruppo {{group}} è stato rimosso dall’utente {{user}}",
-    "admin/email_language_info": "Non vedi la tua lingua? Assicurati che il file sia scrivibile dal tuo webserver in /custom/languages/.",
+    "admin/email_language_info": "Non vedi la tua lingua? Assicurati che il file sia scrivibile dal tuo webserver in /modules/Core/language/.",
     "user/no_providers": "Nessun provider di autenticazione è stato configurato.",
     "general/normal": "Normale",
     "general/orange": "Arancio",

custom/languages/ja_JP.json → modules/Core/language/ja_JP.json

@@ -1076,7 +1076,7 @@
     "admin/can_unlink": "リンク解除可能",
     "admin/editing_integration_for_x": "{{user}}の{{integration}}連携を編集",
     "admin/linking_integration_for_x": "{{user}}の{{integration}} 連携をリンク",
-    "admin/email_language_info": "あなたの言語が表示されませんか？ウェブサーバーの/custom/languages/にある言語ファイルが書き込み可能であることを確認してください。",
+    "admin/email_language_info": "あなたの言語が表示されませんか？ウェブサーバーの/modules/Core/language/にある言語ファイルが書き込み可能であることを確認してください。",
     "admin/page_url_contains_nameless_path": "カスタムページがNamelessMCのページを上書きしてしまいます。",
     "admin/placeholders_last_updated_time": "最終更新: {{time}}",
     "admin/require_integration": "ユーザーにリンクと連携の検証を要求する",

custom/languages/nl_NL.json → modules/Core/language/nl_NL.json

@@ -1038,7 +1038,7 @@
     "admin/api_endpoints_info": "API eindpunten staan Modules toe dat externe applicaties (zoals Minecraft en Discord) te kunnen communiceren met je NamelessMC website. {{docLinkStart}}Bekijk de API documentatie hier{{docLinkEnd}}",
     "admin/debug_link": "Debug link",
     "admin/debug_link_toast": "{{linkStart}}Klik hier{{linkEnd}} om de debuglink te bekijken.",
-    "admin/email_language_info": "Zie je je taal niet? Zorg ervoor dat de taalbestanden schrijfbaar zijn door je webserver in /custom/languages/.",
+    "admin/email_language_info": "Zie je je taal niet? Zorg ervoor dat de taalbestanden schrijfbaar zijn door je webserver in /modules/Core/language/.",
     "admin/at_least_one_external": "Vul alstublieft minstens 1 externe groep in (Minecraft of Discord)",
     "admin/ban_hook_info": "Gebruiker verbannen",
     "admin/bedrock": "Bedrock?",

custom/languages/no_NO.json → modules/Core/language/no_NO.json

@@ -1008,7 +1008,7 @@
     "admin/ban_hook_info": "Bruker utestengt",
     "admin/custom_content": "Egendefinert innhold",
     "admin/editing_integration_for_x": "Redigerer {{integration}}-integreringen for {{user}}",
-    "admin/email_language_info": "Ser du ikke språket ditt? Sjekk om språkfilen er skrivbar av webserveren i /custom/languages/.",
+    "admin/email_language_info": "Ser du ikke språket ditt? Sjekk om språkfilen er skrivbar av webserveren i /modules/Core/language/.",
     "admin/bedrock_help": "Velg dette alternativet hvis serveren er en Bedrock-server.",
     "admin/captcha_general": "Aktiver Captcha på registreringssiden?",
     "admin/captcha_login": "Aktiver Captcha på påloggingssiden?",

custom/languages/pl_PL.json → modules/Core/language/pl_PL.json

@@ -1023,7 +1023,7 @@
     "user/x_replies": "{{count}} komentarzy",
     "user/you_have_been_banned": "Zostałeś zbanowany!",
     "user/you_have_received_a_warning": "Dostałeś ostrzeżenie!",
-    "admin/email_language_info": "Nie widzisz swojego języka? Upewnij się, że plik językowy jest zapisywany przez serwer WWW w katalogu /custom/languages/.",
+    "admin/email_language_info": "Nie widzisz swojego języka? Upewnij się, że plik językowy jest zapisywany przez serwer WWW w katalogu /modules/Core/language/.",
     "admin/administrator": "Administrator",
     "admin/at_least_one_external": "Podaj co najmniej 1 grupę zewnętrzną (Minecraft lub Discord)",
     "admin/authme_db_password_hidden": "Hasło do bazy danych AuthMe jest ukryte ze względów bezpieczeństwa.",

custom/languages/pt_BR.json → modules/Core/language/pt_BR.json

@@ -1048,7 +1048,7 @@
     "user/x_replies": "{{count}} respostas",
     "user/you_have_been_banned": "Você foi banido!",
     "user/you_have_received_a_warning": "Você recebeu uma advertencia!",
-    "admin/email_language_info": "Não está vendo seu idioma? Certifique-se de que seu arquivo de idioma seja gravável pelo seu servidor web em /custom/languages/.",
+    "admin/email_language_info": "Não está vendo seu idioma? Certifique-se de que seu arquivo de idioma seja gravável pelo seu servidor web em /modules/Core/language/.",
     "admin/can_unlink": "Pode desvincular",
     "admin/at_least_one_external": "Insira pelo menos 1 grupo externo (Minecraft ou Discord)",
     "admin/ban_hook_info": "Usuário banido",

custom/languages/ro_RO.json → modules/Core/language/ro_RO.json

@@ -925,7 +925,7 @@
     "admin/api_endpoints_info": "API Endpoint-urile permit modulelor să creeze metode pentru aplicațiile externe (precum Minecraft și Discord) să interacționeze cu website-ul tau. Verifică documentația pentru API {{docLinkStart}}aici{{docLinkEnd}}",
     "admin/clear_cache": "Curata Cache-ul template-urilor",
     "admin/editing_integration_for_x": "Editand integrarea {{integration}} pentru {{user}}",
-    "admin/email_language_info": "Nu vezi limba ta? Asigura-te ca fila de limba are permisiuni de scriere de catre webserver-ul tau in /custom/languages.",
+    "admin/email_language_info": "Nu vezi limba ta? Asigura-te ca fila de limba are permisiuni de scriere de catre webserver-ul tau in /modules/Core/language.",
     "admin/use_external_mail_server": "Foloseste server de mail extern",
     "admin/force_tfa_warning": "Asigura-te ca stii ce face asta sau risti sa te blochezi pe tine si pe restul membrilor din grup pe dinafara.",
     "admin/debug_link_toast": "Link-ul de depanare a fost copiat!<br>Vizualizeaza logul {{linkStart}}aici{{linkEnd}}",

custom/languages/ru_RU.json → modules/Core/language/ru_RU.json

@@ -1080,7 +1080,7 @@
     "general/and_x_more": "и {{count}}",
     "general/internet_explorer_header": "Internet Explorer",
     "general/internet_explorer_info": "Internet Explorer iне поддерживается. Перейдите на более современный браузер.",
-    "admin/email_language_info": "Отсутствует ваш язык? Убедитесь, что файл с переводом доступен для записи в /custom/languages.",
+    "admin/email_language_info": "Отсутствует ваш язык? Убедитесь, что файл с переводом доступен для записи в /modules/Core/language.",
     "admin/facebook_url": "Facebook URL",
     "admin/integration": "Интеграция",
     "admin/integration_sync_not_supported": "Синхронизация недоступна для данного сервиса!",

custom/languages/sk_SK.json → modules/Core/language/sk_SK.json

@@ -1071,7 +1071,7 @@
     "admin/can_unlink": "Dá sa odpojiť",
     "admin/can_unlink_integration": "Môžu používatelia odpojiť integráciu?",
     "admin/cloning_group": "Klonovanie skupiny {{group}}",
-    "admin/email_language_info": "Nevidíte svoj jazyk? Uistite sa, že do jeho jazykového súboru môže váš webový server zapisovať v /custom/languages/.",
+    "admin/email_language_info": "Nevidíte svoj jazyk? Uistite sa, že do jeho jazykového súboru môže váš webový server zapisovať v /modules/Core/language/.",
     "admin/group_cloned_successfully": "Skupina bola úspešne naklonovaná.",
     "admin/host": "Host",
     "admin/integration": "Integrácia",

custom/languages/sv_SE.json → modules/Core/language/sv_SE.json

@@ -1079,7 +1079,7 @@
     "admin/delete_hook": "Är du säker på att du vill radera denna hook?",
     "admin/editing_integration_for_x": "Ändrar {{integration}} integrationen för {{user}}",
     "admin/editing_integration_x": "Ändrar integrationen {{integration}}",
-    "admin/email_language_info": "Ser inte ditt språk? Dubbelkolla att språk-filen är skrivbar av din webbserver i /custom/languages/.",
+    "admin/email_language_info": "Ser inte ditt språk? Dubbelkolla att språk-filen är skrivbar av din webbserver i /modules/Core/language/.",
     "admin/integration": "Integration",
     "admin/oauth_info": "Konfigurera OAuth-leverantörerna för att tillåta användare att logga in med deras sociala nätverks-konton. {{docLinkStart}}Kolla våran dokumentation för hjälp{{docLinkEnd}}.",
     "admin/page": "Sida",

custom/languages/tr_TR.json → modules/Core/language/tr_TR.json

@@ -915,7 +915,7 @@
     "admin/announcements": "Duyurular",
     "admin/api_endpoints": "API uç noktası",
     "admin/hooks": "Webhooklar",
-    "admin/email_language_info": "Dilinizi görmüyor musunuz? Dil dosyasının web sunucunuz tarafından /custom/languages/ içinde yazılabilir olduğundan emin olun.",
+    "admin/email_language_info": "Dilinizi görmüyor musunuz? Dil dosyasının web sunucunuz tarafından /modules/Core/language/ içinde yazılabilir olduğundan emin olun.",
     "emails/forum_topic_reply_message": "{{author}}, takip ettiğiniz bir konuyu yanıtladı. İçerik: {{content}}",
     "general/red": "Kırmızı",
     "installer/step_conversion": "Dönüştür",

custom/languages/vi_VN.json → modules/Core/language/vi_VN.json

@@ -165,7 +165,7 @@
     "admin/email_errors": "Lỗi email",
     "admin/email_errors_logged": "Lỗi email đã được ghi lại",
     "admin/email_errors_purged_successfully": "Lỗi email đã được xóa thành công.",
-    "admin/email_language_info": "Bạn không thấy ngôn ngữ của mình? Đảm bảo rằng tệp ngôn ngữ có thể ghi trên webserver của bạn trong /custom/languages/.",
+    "admin/email_language_info": "Bạn không thấy ngôn ngữ của mình? Đảm bảo rằng tệp ngôn ngữ có thể ghi trên webserver của bạn trong /modules/Core/language/.",
     "admin/email_logs": "Email hàng loạt",
     "admin/email_message_greeting": "Lời chào",
     "admin/email_message_message": "Tin nhắn",

custom/languages/zh_CN.json → modules/Core/language/zh_CN.json

@@ -1079,7 +1079,7 @@
     "admin/custom_content": "自定义内容",
     "admin/editing_integration_for_x": "正在修改 {{user}} 的 {{integration}} 集成",
     "admin/editing_integration_x": "正在修改 {{integration}} 集成",
-    "admin/email_language_info": "找不到你的语言? 请确保在 /custom/languages 目录中的语言文件可写。",
+    "admin/email_language_info": "找不到你的语言? 请确保在 /modules/Core/language 目录中的语言文件可写。",
     "admin/favicon_image_x": "Favicon 图片: {{imageName}}",
     "admin/group_cloned_successfully": "成功复制了群组。",
     "admin/home_custom_content": "主页自定义内容",