From 9c27f947094fac529ea2a3be3ac325fce60d7161 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 7 Nov 2025 14:38:55 +0000 Subject: [PATCH] move language specific folders into its own subfolder in /view --- Zotlabs/Render/SmartyTemplate.php | 2 +- include/language.php | 28 +++++++++--------- view/{ => lang}/ca/hmessages.po | 0 view/{ => lang}/ca/hstrings.php | 0 view/{ => lang}/ca/lostpass_eml.tpl | 0 view/{ => lang}/ca/messages.po | 0 view/{ => lang}/ca/passchanged_eml.tpl | 0 view/{ => lang}/ca/register_open_eml.tpl | 0 view/{ => lang}/ca/register_verify_eml.tpl | 0 view/{ => lang}/ca/strings.php | 0 view/{ => lang}/ca/update_fail_eml.tpl | 0 view/{ => lang}/de | 0 view/{ => lang}/de-de/hmessages.po | 0 view/{ => lang}/de-de/hstrings.php | 0 .../de-de/invite.casual.subject.tpl | 0 view/{ => lang}/de-de/invite.casual.tpl | 0 .../de-de/invite.formal.subject.tpl | 0 view/{ => lang}/de-de/invite.formal.tpl | 0 view/{ => lang}/de-de/lostpass_eml.tpl | 0 view/{ => lang}/de-de/messages.po | 0 view/{ => lang}/de-de/passchanged_eml.tpl | 0 view/{ => lang}/de-de/register_open_eml.tpl | 0 view/{ => lang}/de-de/register_verify_eml.tpl | 0 .../de-de/register_verify_member.tpl | 0 view/{ => lang}/de-de/strings.php | 0 view/{ => lang}/de-de/update_fail_eml.tpl | 0 view/{ => lang}/en-au/hstrings.php | 2 +- view/{ => lang}/en-au/lostpass_eml.tpl | 0 view/{ => lang}/en-au/passchanged_eml.tpl | 0 view/{ => lang}/en-au/register_open_eml.tpl | 0 view/{ => lang}/en-au/register_verify_eml.tpl | 0 .../en-au/register_verify_member.tpl | 0 view/{ => lang}/en-au/strings.php | 2 +- view/{ => lang}/en-au/update_fail_eml.tpl | 0 view/{ => lang}/en-gb/hstrings.php | 0 view/{ => lang}/en-gb/lostpass_eml.tpl | 0 view/{ => lang}/en-gb/passchanged_eml.tpl | 0 view/{ => lang}/en-gb/register_open_eml.tpl | 0 view/{ => lang}/en-gb/register_verify_eml.tpl | 0 .../en-gb/register_verify_member.tpl | 0 view/{ => lang}/en-gb/strings.php | 0 view/{ => lang}/en-gb/update_fail_eml.tpl | 0 view/{ => lang}/en/cert_bad_eml.tpl | 0 view/{ => lang}/en/cron_bad_eml.tpl | 0 view/{ => lang}/en/htconfig.tpl | 0 view/{ => lang}/en/invite.casual.subject.tpl | 0 view/{ => lang}/en/invite.casual.tpl | 0 view/{ => lang}/en/invite.formal.subject.tpl | 0 view/{ => lang}/en/invite.formal.tpl | 0 .../{ => lang}/en/invite.material.subject.tpl | 0 view/{ => lang}/en/invite.material.tpl | 0 view/{ => lang}/en/lostpass_eml.tpl | 0 view/{ => lang}/en/passchanged_eml.tpl | 0 view/{ => lang}/en/register_open_eml.tpl | 0 view/{ => lang}/en/register_verify_eml.tpl | 0 view/{ => lang}/en/register_verify_member.tpl | 0 view/{ => lang}/en/update_fail_eml.tpl | 0 view/{ => lang}/es | 0 view/{ => lang}/es-es/hmessages.po | 0 view/{ => lang}/es-es/hstrings.php | 0 .../es-es/invite.casual.subject.tpl | 0 view/{ => lang}/es-es/invite.casual.tpl | 0 .../es-es/invite.formal.subject.tpl | 0 view/{ => lang}/es-es/invite.formal.tpl | 0 view/{ => lang}/es-es/lostpass_eml.tpl | 0 view/{ => lang}/es-es/messages.po | 0 view/{ => lang}/es-es/passchanged_eml.tpl | 0 view/{ => lang}/es-es/register_open_eml.tpl | 0 view/{ => lang}/es-es/register_verify_eml.tpl | 0 .../es-es/register_verify_member.tpl | 0 view/{ => lang}/es-es/strings.php | 0 view/{ => lang}/es-es/update_fail_eml.tpl | 0 view/{ => lang}/fr/cert_bad_eml.tpl | 0 view/{ => lang}/fr/cron_bad_eml.tpl | 0 view/{ => lang}/fr/hmessages.po | 0 view/{ => lang}/fr/hstrings.php | 0 view/{ => lang}/fr/htconfig.tpl | 0 view/{ => lang}/fr/invite.casual.subject.tpl | 0 view/{ => lang}/fr/invite.casual.tpl | 0 view/{ => lang}/fr/invite.formal.subject.tpl | 0 view/{ => lang}/fr/invite.formal.tpl | 0 .../{ => lang}/fr/invite.material.subject.tpl | 0 view/{ => lang}/fr/invite.material.tpl | 0 view/{ => lang}/fr/lostpass_eml.tpl | 0 view/{ => lang}/fr/messages.po | 0 view/{ => lang}/fr/passchanged_eml.tpl | 0 view/{ => lang}/fr/register_open_eml.tpl | 0 view/{ => lang}/fr/register_verify_eml.tpl | 0 view/{ => lang}/fr/register_verify_member.tpl | 0 view/{ => lang}/fr/strings.php | 0 view/{ => lang}/fr/update_fail_eml.tpl | 0 view/{ => lang}/he/hmessages.po | 0 view/{ => lang}/he/hstrings.php | 0 view/{ => lang}/he/lostpass_eml.tpl | 0 view/{ => lang}/he/messages.po | 0 view/{ => lang}/he/passchanged_eml.tpl | 0 view/{ => lang}/he/register_open_eml.tpl | 0 view/{ => lang}/he/register_verify_eml.tpl | 0 view/{ => lang}/he/register_verify_member.tpl | 0 view/{ => lang}/he/strings.php | 0 view/{ => lang}/he/update_fail_eml.tpl | 0 view/{ => lang}/it/hmessages.po | 0 view/{ => lang}/it/hstrings.php | 0 view/{ => lang}/it/lostpass_eml.tpl | 0 view/{ => lang}/it/messages.po | 0 view/{ => lang}/it/passchanged_eml.tpl | 0 view/{ => lang}/it/register_open_eml.tpl | 0 view/{ => lang}/it/register_verify_eml.tpl | 0 view/{ => lang}/it/register_verify_member.tpl | 0 view/{ => lang}/it/strings.php | 0 view/{ => lang}/it/update_fail_eml.tpl | 0 view/{ => lang}/ja/.gitkeep | 0 view/{ => lang}/ja/hmessages.po | 0 view/{ => lang}/ja/hstrings.php | 0 view/{ => lang}/nb/hmessages.po | 0 view/{ => lang}/nb/hstrings.php | 0 view/{ => lang}/nb/lostpass_eml.tpl | 0 view/{ => lang}/nb/messages.po | 0 view/{ => lang}/nb/passchanged_eml.tpl | 0 view/{ => lang}/nb/register_open_eml.tpl | 0 view/{ => lang}/nb/register_verify_eml.tpl | 0 view/{ => lang}/nb/strings.php | 0 view/{ => lang}/nb/update_fail_eml.tpl | 0 view/{ => lang}/nl/hmessages.po | 0 view/{ => lang}/nl/hstrings.php | 0 view/{ => lang}/nl/lostpass_eml.tpl | 0 view/{ => lang}/nl/messages.po | 0 view/{ => lang}/nl/passchanged_eml.tpl | 0 view/{ => lang}/nl/register_open_eml.tpl | 0 view/{ => lang}/nl/register_verify_eml.tpl | 0 view/{ => lang}/nl/register_verify_member.tpl | 0 view/{ => lang}/nl/strings.php | 0 view/{ => lang}/nl/update_fail_eml.tpl | 0 view/{ => lang}/pl/cert_bad_eml.tpl | 0 view/{ => lang}/pl/cron_bad_eml.tpl | 0 view/{ => lang}/pl/hmessages.mo | Bin view/{ => lang}/pl/hmessages.po | 0 view/{ => lang}/pl/hmessages.pot | 0 view/{ => lang}/pl/hstrings.php | 0 view/{ => lang}/pl/htconfig.tpl | 0 view/{ => lang}/pl/invite.casual.subject.tpl | 0 view/{ => lang}/pl/invite.casual.tpl | 0 view/{ => lang}/pl/invite.formal.subject.tpl | 0 view/{ => lang}/pl/invite.formal.tpl | 0 .../{ => lang}/pl/invite.material.subject.tpl | 0 view/{ => lang}/pl/invite.material.tpl | 0 view/{ => lang}/pl/lostpass_eml.tpl | 0 view/{ => lang}/pl/passchanged_eml.tpl | 0 view/{ => lang}/pl/register_open_eml.tpl | 0 view/{ => lang}/pl/register_verify_eml.tpl | 0 view/{ => lang}/pl/register_verify_member.tpl | 0 view/{ => lang}/pl/update_fail_eml.tpl | 0 view/{ => lang}/pt-br/hmessages.po | 0 view/{ => lang}/pt-br/hstrings.php | 0 view/{ => lang}/pt-br/lostpass_eml.tpl | 0 view/{ => lang}/pt-br/messages.po | 0 view/{ => lang}/pt-br/passchanged_eml.tpl | 0 view/{ => lang}/pt-br/register_open_eml.tpl | 0 view/{ => lang}/pt-br/register_verify_eml.tpl | 0 view/{ => lang}/pt-br/strings.php | 0 view/{ => lang}/pt-br/update_fail_eml.tpl | 0 view/{ => lang}/ru/hmessages.po | 0 view/{ => lang}/ru/hstrings.php | 0 .../ru/hubzilla_update_fail_eml.tpl | 0 view/{ => lang}/ru/invite.casual.subject.tpl | 0 view/{ => lang}/ru/invite.casual.tpl | 0 view/{ => lang}/ru/invite.formal.subject.tpl | 0 view/{ => lang}/ru/invite.formal.tpl | 0 .../{ => lang}/ru/invite.material.subject.tpl | 0 view/{ => lang}/ru/invite.material.tpl | 0 view/{ => lang}/ru/lostpass_eml.tpl | 0 view/{ => lang}/ru/messages.po | 0 view/{ => lang}/ru/passchanged_eml.tpl | 0 view/{ => lang}/ru/register_open_eml.tpl | 0 view/{ => lang}/ru/register_verify_eml.tpl | 0 view/{ => lang}/ru/register_verify_member.tpl | 0 view/{ => lang}/ru/strings.php | 0 view/{ => lang}/ru/update_fail_eml.tpl | 0 view/{ => lang}/sv/hmessages.po | 0 view/{ => lang}/sv/hstrings.php | 0 view/{ => lang}/sv/lostpass_eml.tpl | 0 view/{ => lang}/sv/messages.po | 0 view/{ => lang}/sv/passchanged_eml.tpl | 0 view/{ => lang}/sv/register_open_eml.tpl | 0 view/{ => lang}/sv/register_verify_eml.tpl | 0 view/{ => lang}/sv/register_verify_member.tpl | 0 view/{ => lang}/sv/strings.php | 0 view/{ => lang}/sv/update_fail_eml.tpl | 0 188 files changed, 17 insertions(+), 17 deletions(-) rename view/{ => lang}/ca/hmessages.po (100%) rename view/{ => lang}/ca/hstrings.php (100%) rename view/{ => lang}/ca/lostpass_eml.tpl (100%) rename view/{ => lang}/ca/messages.po (100%) rename view/{ => lang}/ca/passchanged_eml.tpl (100%) rename view/{ => lang}/ca/register_open_eml.tpl (100%) rename view/{ => lang}/ca/register_verify_eml.tpl (100%) rename view/{ => lang}/ca/strings.php (100%) rename view/{ => lang}/ca/update_fail_eml.tpl (100%) rename view/{ => lang}/de (100%) rename view/{ => lang}/de-de/hmessages.po (100%) rename view/{ => lang}/de-de/hstrings.php (100%) rename view/{ => lang}/de-de/invite.casual.subject.tpl (100%) rename view/{ => lang}/de-de/invite.casual.tpl (100%) rename view/{ => lang}/de-de/invite.formal.subject.tpl (100%) rename view/{ => lang}/de-de/invite.formal.tpl (100%) rename view/{ => lang}/de-de/lostpass_eml.tpl (100%) rename view/{ => lang}/de-de/messages.po (100%) rename view/{ => lang}/de-de/passchanged_eml.tpl (100%) rename view/{ => lang}/de-de/register_open_eml.tpl (100%) rename view/{ => lang}/de-de/register_verify_eml.tpl (100%) rename view/{ => lang}/de-de/register_verify_member.tpl (100%) rename view/{ => lang}/de-de/strings.php (100%) rename view/{ => lang}/de-de/update_fail_eml.tpl (100%) rename view/{ => lang}/en-au/hstrings.php (72%) rename view/{ => lang}/en-au/lostpass_eml.tpl (100%) rename view/{ => lang}/en-au/passchanged_eml.tpl (100%) rename view/{ => lang}/en-au/register_open_eml.tpl (100%) rename view/{ => lang}/en-au/register_verify_eml.tpl (100%) rename view/{ => lang}/en-au/register_verify_member.tpl (100%) rename view/{ => lang}/en-au/strings.php (72%) rename view/{ => lang}/en-au/update_fail_eml.tpl (100%) rename view/{ => lang}/en-gb/hstrings.php (100%) rename view/{ => lang}/en-gb/lostpass_eml.tpl (100%) rename view/{ => lang}/en-gb/passchanged_eml.tpl (100%) rename view/{ => lang}/en-gb/register_open_eml.tpl (100%) rename view/{ => lang}/en-gb/register_verify_eml.tpl (100%) rename view/{ => lang}/en-gb/register_verify_member.tpl (100%) rename view/{ => lang}/en-gb/strings.php (100%) rename view/{ => lang}/en-gb/update_fail_eml.tpl (100%) rename view/{ => lang}/en/cert_bad_eml.tpl (100%) rename view/{ => lang}/en/cron_bad_eml.tpl (100%) rename view/{ => lang}/en/htconfig.tpl (100%) rename view/{ => lang}/en/invite.casual.subject.tpl (100%) rename view/{ => lang}/en/invite.casual.tpl (100%) rename view/{ => lang}/en/invite.formal.subject.tpl (100%) rename view/{ => lang}/en/invite.formal.tpl (100%) rename view/{ => lang}/en/invite.material.subject.tpl (100%) rename view/{ => lang}/en/invite.material.tpl (100%) rename view/{ => lang}/en/lostpass_eml.tpl (100%) rename view/{ => lang}/en/passchanged_eml.tpl (100%) rename view/{ => lang}/en/register_open_eml.tpl (100%) rename view/{ => lang}/en/register_verify_eml.tpl (100%) rename view/{ => lang}/en/register_verify_member.tpl (100%) rename view/{ => lang}/en/update_fail_eml.tpl (100%) rename view/{ => lang}/es (100%) rename view/{ => lang}/es-es/hmessages.po (100%) rename view/{ => lang}/es-es/hstrings.php (100%) rename view/{ => lang}/es-es/invite.casual.subject.tpl (100%) rename view/{ => lang}/es-es/invite.casual.tpl (100%) rename view/{ => lang}/es-es/invite.formal.subject.tpl (100%) rename view/{ => lang}/es-es/invite.formal.tpl (100%) rename view/{ => lang}/es-es/lostpass_eml.tpl (100%) rename view/{ => lang}/es-es/messages.po (100%) rename view/{ => lang}/es-es/passchanged_eml.tpl (100%) rename view/{ => lang}/es-es/register_open_eml.tpl (100%) rename view/{ => lang}/es-es/register_verify_eml.tpl (100%) rename view/{ => lang}/es-es/register_verify_member.tpl (100%) rename view/{ => lang}/es-es/strings.php (100%) rename view/{ => lang}/es-es/update_fail_eml.tpl (100%) rename view/{ => lang}/fr/cert_bad_eml.tpl (100%) rename view/{ => lang}/fr/cron_bad_eml.tpl (100%) rename view/{ => lang}/fr/hmessages.po (100%) rename view/{ => lang}/fr/hstrings.php (100%) rename view/{ => lang}/fr/htconfig.tpl (100%) rename view/{ => lang}/fr/invite.casual.subject.tpl (100%) rename view/{ => lang}/fr/invite.casual.tpl (100%) rename view/{ => lang}/fr/invite.formal.subject.tpl (100%) rename view/{ => lang}/fr/invite.formal.tpl (100%) rename view/{ => lang}/fr/invite.material.subject.tpl (100%) rename view/{ => lang}/fr/invite.material.tpl (100%) rename view/{ => lang}/fr/lostpass_eml.tpl (100%) rename view/{ => lang}/fr/messages.po (100%) rename view/{ => lang}/fr/passchanged_eml.tpl (100%) rename view/{ => lang}/fr/register_open_eml.tpl (100%) rename view/{ => lang}/fr/register_verify_eml.tpl (100%) rename view/{ => lang}/fr/register_verify_member.tpl (100%) rename view/{ => lang}/fr/strings.php (100%) rename view/{ => lang}/fr/update_fail_eml.tpl (100%) rename view/{ => lang}/he/hmessages.po (100%) rename view/{ => lang}/he/hstrings.php (100%) rename view/{ => lang}/he/lostpass_eml.tpl (100%) rename view/{ => lang}/he/messages.po (100%) rename view/{ => lang}/he/passchanged_eml.tpl (100%) rename view/{ => lang}/he/register_open_eml.tpl (100%) rename view/{ => lang}/he/register_verify_eml.tpl (100%) rename view/{ => lang}/he/register_verify_member.tpl (100%) rename view/{ => lang}/he/strings.php (100%) rename view/{ => lang}/he/update_fail_eml.tpl (100%) rename view/{ => lang}/it/hmessages.po (100%) rename view/{ => lang}/it/hstrings.php (100%) rename view/{ => lang}/it/lostpass_eml.tpl (100%) rename view/{ => lang}/it/messages.po (100%) rename view/{ => lang}/it/passchanged_eml.tpl (100%) rename view/{ => lang}/it/register_open_eml.tpl (100%) rename view/{ => lang}/it/register_verify_eml.tpl (100%) rename view/{ => lang}/it/register_verify_member.tpl (100%) rename view/{ => lang}/it/strings.php (100%) rename view/{ => lang}/it/update_fail_eml.tpl (100%) rename view/{ => lang}/ja/.gitkeep (100%) rename view/{ => lang}/ja/hmessages.po (100%) rename view/{ => lang}/ja/hstrings.php (100%) rename view/{ => lang}/nb/hmessages.po (100%) rename view/{ => lang}/nb/hstrings.php (100%) rename view/{ => lang}/nb/lostpass_eml.tpl (100%) rename view/{ => lang}/nb/messages.po (100%) rename view/{ => lang}/nb/passchanged_eml.tpl (100%) rename view/{ => lang}/nb/register_open_eml.tpl (100%) rename view/{ => lang}/nb/register_verify_eml.tpl (100%) rename view/{ => lang}/nb/strings.php (100%) rename view/{ => lang}/nb/update_fail_eml.tpl (100%) rename view/{ => lang}/nl/hmessages.po (100%) rename view/{ => lang}/nl/hstrings.php (100%) rename view/{ => lang}/nl/lostpass_eml.tpl (100%) rename view/{ => lang}/nl/messages.po (100%) rename view/{ => lang}/nl/passchanged_eml.tpl (100%) rename view/{ => lang}/nl/register_open_eml.tpl (100%) rename view/{ => lang}/nl/register_verify_eml.tpl (100%) rename view/{ => lang}/nl/register_verify_member.tpl (100%) rename view/{ => lang}/nl/strings.php (100%) rename view/{ => lang}/nl/update_fail_eml.tpl (100%) rename view/{ => lang}/pl/cert_bad_eml.tpl (100%) rename view/{ => lang}/pl/cron_bad_eml.tpl (100%) rename view/{ => lang}/pl/hmessages.mo (100%) rename view/{ => lang}/pl/hmessages.po (100%) rename view/{ => lang}/pl/hmessages.pot (100%) rename view/{ => lang}/pl/hstrings.php (100%) rename view/{ => lang}/pl/htconfig.tpl (100%) rename view/{ => lang}/pl/invite.casual.subject.tpl (100%) rename view/{ => lang}/pl/invite.casual.tpl (100%) rename view/{ => lang}/pl/invite.formal.subject.tpl (100%) rename view/{ => lang}/pl/invite.formal.tpl (100%) rename view/{ => lang}/pl/invite.material.subject.tpl (100%) rename view/{ => lang}/pl/invite.material.tpl (100%) rename view/{ => lang}/pl/lostpass_eml.tpl (100%) rename view/{ => lang}/pl/passchanged_eml.tpl (100%) rename view/{ => lang}/pl/register_open_eml.tpl (100%) rename view/{ => lang}/pl/register_verify_eml.tpl (100%) rename view/{ => lang}/pl/register_verify_member.tpl (100%) rename view/{ => lang}/pl/update_fail_eml.tpl (100%) rename view/{ => lang}/pt-br/hmessages.po (100%) rename view/{ => lang}/pt-br/hstrings.php (100%) rename view/{ => lang}/pt-br/lostpass_eml.tpl (100%) rename view/{ => lang}/pt-br/messages.po (100%) rename view/{ => lang}/pt-br/passchanged_eml.tpl (100%) rename view/{ => lang}/pt-br/register_open_eml.tpl (100%) rename view/{ => lang}/pt-br/register_verify_eml.tpl (100%) rename view/{ => lang}/pt-br/strings.php (100%) rename view/{ => lang}/pt-br/update_fail_eml.tpl (100%) rename view/{ => lang}/ru/hmessages.po (100%) rename view/{ => lang}/ru/hstrings.php (100%) rename view/{ => lang}/ru/hubzilla_update_fail_eml.tpl (100%) rename view/{ => lang}/ru/invite.casual.subject.tpl (100%) rename view/{ => lang}/ru/invite.casual.tpl (100%) rename view/{ => lang}/ru/invite.formal.subject.tpl (100%) rename view/{ => lang}/ru/invite.formal.tpl (100%) rename view/{ => lang}/ru/invite.material.subject.tpl (100%) rename view/{ => lang}/ru/invite.material.tpl (100%) rename view/{ => lang}/ru/lostpass_eml.tpl (100%) rename view/{ => lang}/ru/messages.po (100%) rename view/{ => lang}/ru/passchanged_eml.tpl (100%) rename view/{ => lang}/ru/register_open_eml.tpl (100%) rename view/{ => lang}/ru/register_verify_eml.tpl (100%) rename view/{ => lang}/ru/register_verify_member.tpl (100%) rename view/{ => lang}/ru/strings.php (100%) rename view/{ => lang}/ru/update_fail_eml.tpl (100%) rename view/{ => lang}/sv/hmessages.po (100%) rename view/{ => lang}/sv/hstrings.php (100%) rename view/{ => lang}/sv/lostpass_eml.tpl (100%) rename view/{ => lang}/sv/messages.po (100%) rename view/{ => lang}/sv/passchanged_eml.tpl (100%) rename view/{ => lang}/sv/register_open_eml.tpl (100%) rename view/{ => lang}/sv/register_verify_eml.tpl (100%) rename view/{ => lang}/sv/register_verify_member.tpl (100%) rename view/{ => lang}/sv/strings.php (100%) rename view/{ => lang}/sv/update_fail_eml.tpl (100%) diff --git a/Zotlabs/Render/SmartyTemplate.php b/Zotlabs/Render/SmartyTemplate.php index 79f03637b..a4ae8b68a 100644 --- a/Zotlabs/Render/SmartyTemplate.php +++ b/Zotlabs/Render/SmartyTemplate.php @@ -72,7 +72,7 @@ class SmartyTemplate implements TemplateEngine { if ($root != '' && substr($root,-1) != '/' ) { $root .= '/'; } - foreach ( [ $root . "view/$lang/$file", $root . "view/en/$file", '' ] as $template_file) { + foreach ( [ $root . "view/lang/$lang/$file", $root . "view/lang/en/$file", '' ] as $template_file) { if (is_file($template_file)) { break; } diff --git a/include/language.php b/include/language.php index 9b68717f8..5d7e834d4 100644 --- a/include/language.php +++ b/include/language.php @@ -68,7 +68,7 @@ function get_best_language() { if(isset($langs) && count($langs)) { foreach ($langs as $lang => $v) { $lang = strtolower($lang); - if(is_dir("view/$lang")) { + if(is_dir("view/lang/$lang")) { $preferred = $lang; break; } @@ -93,7 +93,7 @@ function get_best_language() { } /* Check the base */ $lang = strtolower(substr($lang,0,2)); - if(is_dir("view/$lang")) { + if(is_dir("view/lang/$lang")) { $preferred = $lang; break; } @@ -160,11 +160,11 @@ function load_translation_table($lang, $install = false) { App::$strings = array(); - if(file_exists("view/$lang/hstrings.php")) { - include("view/$lang/hstrings.php"); + if(file_exists("view/lang/$lang/hstrings.php")) { + include("view/lang/$lang/hstrings.php"); } - elseif(file_exists("view/$lang/strings.php")) { - include("view/$lang/strings.php"); + elseif(file_exists("view/lang/$lang/strings.php")) { + include("view/lang/$lang/strings.php"); } if(! $install) { @@ -185,11 +185,11 @@ function load_translation_table($lang, $install = false) { // Allow individual strings to be over-ridden on this site // Either for the default language or for all languages - if(file_exists("view/local-$lang/hstrings.php")) { - include("view/local-$lang/hstrings.php"); + if(file_exists("view/lang/local-$lang/hstrings.php")) { + include("view/lang/local-$lang/hstrings.php"); } - elseif(file_exists("view/local-$lang/strings.php")) { - include("view/local-$lang/strings.php"); + elseif(file_exists("view/lang/local-$lang/strings.php")) { + include("view/lang/local-$lang/strings.php"); } } @@ -387,16 +387,16 @@ function get_language_name($s, $l = null) { function language_list() { - $langs = glob('view/*/hstrings.php'); + $langs = glob('view/lang/*/hstrings.php'); $lang_options = array(); if(is_array($langs) && count($langs)) { - if(! in_array('view/en/hstrings.php',$langs)) - $langs[] = 'view/en/'; + if(! in_array('view/lang/en/hstrings.php',$langs)) + $langs[] = 'view/lang/en/'; asort($langs); foreach($langs as $l) { - $ll = substr($l,5); + $ll = substr($l,10); $ll = substr($ll,0,strrpos($ll,'/')); $lang_options[$ll] = get_language_name($ll, $ll) . " ($ll)"; } diff --git a/view/ca/hmessages.po b/view/lang/ca/hmessages.po similarity index 100% rename from view/ca/hmessages.po rename to view/lang/ca/hmessages.po diff --git a/view/ca/hstrings.php b/view/lang/ca/hstrings.php similarity index 100% rename from view/ca/hstrings.php rename to view/lang/ca/hstrings.php diff --git a/view/ca/lostpass_eml.tpl b/view/lang/ca/lostpass_eml.tpl similarity index 100% rename from view/ca/lostpass_eml.tpl rename to view/lang/ca/lostpass_eml.tpl diff --git a/view/ca/messages.po b/view/lang/ca/messages.po similarity index 100% rename from view/ca/messages.po rename to view/lang/ca/messages.po diff --git a/view/ca/passchanged_eml.tpl b/view/lang/ca/passchanged_eml.tpl similarity index 100% rename from view/ca/passchanged_eml.tpl rename to view/lang/ca/passchanged_eml.tpl diff --git a/view/ca/register_open_eml.tpl b/view/lang/ca/register_open_eml.tpl similarity index 100% rename from view/ca/register_open_eml.tpl rename to view/lang/ca/register_open_eml.tpl diff --git a/view/ca/register_verify_eml.tpl b/view/lang/ca/register_verify_eml.tpl similarity index 100% rename from view/ca/register_verify_eml.tpl rename to view/lang/ca/register_verify_eml.tpl diff --git a/view/ca/strings.php b/view/lang/ca/strings.php similarity index 100% rename from view/ca/strings.php rename to view/lang/ca/strings.php diff --git a/view/ca/update_fail_eml.tpl b/view/lang/ca/update_fail_eml.tpl similarity index 100% rename from view/ca/update_fail_eml.tpl rename to view/lang/ca/update_fail_eml.tpl diff --git a/view/de b/view/lang/de similarity index 100% rename from view/de rename to view/lang/de diff --git a/view/de-de/hmessages.po b/view/lang/de-de/hmessages.po similarity index 100% rename from view/de-de/hmessages.po rename to view/lang/de-de/hmessages.po diff --git a/view/de-de/hstrings.php b/view/lang/de-de/hstrings.php similarity index 100% rename from view/de-de/hstrings.php rename to view/lang/de-de/hstrings.php diff --git a/view/de-de/invite.casual.subject.tpl b/view/lang/de-de/invite.casual.subject.tpl similarity index 100% rename from view/de-de/invite.casual.subject.tpl rename to view/lang/de-de/invite.casual.subject.tpl diff --git a/view/de-de/invite.casual.tpl b/view/lang/de-de/invite.casual.tpl similarity index 100% rename from view/de-de/invite.casual.tpl rename to view/lang/de-de/invite.casual.tpl diff --git a/view/de-de/invite.formal.subject.tpl b/view/lang/de-de/invite.formal.subject.tpl similarity index 100% rename from view/de-de/invite.formal.subject.tpl rename to view/lang/de-de/invite.formal.subject.tpl diff --git a/view/de-de/invite.formal.tpl b/view/lang/de-de/invite.formal.tpl similarity index 100% rename from view/de-de/invite.formal.tpl rename to view/lang/de-de/invite.formal.tpl diff --git a/view/de-de/lostpass_eml.tpl b/view/lang/de-de/lostpass_eml.tpl similarity index 100% rename from view/de-de/lostpass_eml.tpl rename to view/lang/de-de/lostpass_eml.tpl diff --git a/view/de-de/messages.po b/view/lang/de-de/messages.po similarity index 100% rename from view/de-de/messages.po rename to view/lang/de-de/messages.po diff --git a/view/de-de/passchanged_eml.tpl b/view/lang/de-de/passchanged_eml.tpl similarity index 100% rename from view/de-de/passchanged_eml.tpl rename to view/lang/de-de/passchanged_eml.tpl diff --git a/view/de-de/register_open_eml.tpl b/view/lang/de-de/register_open_eml.tpl similarity index 100% rename from view/de-de/register_open_eml.tpl rename to view/lang/de-de/register_open_eml.tpl diff --git a/view/de-de/register_verify_eml.tpl b/view/lang/de-de/register_verify_eml.tpl similarity index 100% rename from view/de-de/register_verify_eml.tpl rename to view/lang/de-de/register_verify_eml.tpl diff --git a/view/de-de/register_verify_member.tpl b/view/lang/de-de/register_verify_member.tpl similarity index 100% rename from view/de-de/register_verify_member.tpl rename to view/lang/de-de/register_verify_member.tpl diff --git a/view/de-de/strings.php b/view/lang/de-de/strings.php similarity index 100% rename from view/de-de/strings.php rename to view/lang/de-de/strings.php diff --git a/view/de-de/update_fail_eml.tpl b/view/lang/de-de/update_fail_eml.tpl similarity index 100% rename from view/de-de/update_fail_eml.tpl rename to view/lang/de-de/update_fail_eml.tpl diff --git a/view/en-au/hstrings.php b/view/lang/en-au/hstrings.php similarity index 72% rename from view/en-au/hstrings.php rename to view/lang/en-au/hstrings.php index 95f8c4e00..b40739e0e 100644 --- a/view/en-au/hstrings.php +++ b/view/lang/en-au/hstrings.php @@ -1,5 +1,5 @@