diff --git a/.github/workflows/create-translation-pull-request-v5.yml b/.github/workflows/create-translation-pull-request-v5.yml index 673410d759b40..44d0d574dd8a5 100644 --- a/.github/workflows/create-translation-pull-request-v5.yml +++ b/.github/workflows/create-translation-pull-request-v5.yml @@ -60,7 +60,7 @@ jobs: - name: Update static error pages run: | - npm ci --ignore-scripts && node build/build.js --build-pages + npm ci --ignore-scripts && node build/build.mjs --build-pages - name: Create commit continue-on-error: true diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php index 5db2d18bf0946..a29955f38790a 100644 --- a/administrator/components/com_content/tmpl/articles/default.php +++ b/administrator/components/com_content/tmpl/articles/default.php @@ -326,7 +326,7 @@ escape($item->access_level); ?> - created_by != 0) : ?> + author_name)) : ?> escape($item->author_name); ?> diff --git a/includes/incompatible.html b/includes/incompatible.html index 4593b6d29f35f..513d0941d61e5 100644 --- a/includes/incompatible.html +++ b/includes/incompatible.html @@ -6,7 +6,7 @@ Joomla: unsupported PHP version - +
diff --git a/installation/language/af-ZA/langmetadata.xml b/installation/language/af-ZA/langmetadata.xml index 335a6599536d1..42546f656247f 100644 --- a/installation/language/af-ZA/langmetadata.xml +++ b/installation/language/af-ZA/langmetadata.xml @@ -1,7 +1,7 @@ Afrikaans (Suid-Afrika) - 5.2.6 + 5.3.0 2025-03 Afrikaans Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ar-AA/joomla.ini b/installation/language/ar-AA/joomla.ini index b92783ff8b2fe..6452eaea8febf 100644 --- a/installation/language/ar-AA/joomla.ini +++ b/installation/language/ar-AA/joomla.ini @@ -5,31 +5,31 @@ ; Fatal error page ; These will be processed by the JavaScript Build -BUILD_FATAL_HEADER="عذرًا ، كانت هناك مشكلة لم نتمكن من تجاوزها." +BUILD_FATAL_HEADER="عذرًا، كانت هناك مشكلة لم نتمكن من تجاوزها." BUILD_FATAL_LANGUAGE="اللغة العربية بالكود الموحد" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR -BUILD_FATAL_TEXT="أعاد الخادم ملف \"{{statusCode_statusText}}\"" +BUILD_FATAL_TEXT="أرجع الخادم \"{{statusCode_statusText}}\"" BUILD_FATAL_URL_TEXT="ساعدني في حل هذا" ; These will be processed by the JavaScript Build BUILD_INCOMPLETE_HEADER="إعداد البيئة غير مكتمل" BUILD_INCOMPLETE_LANGUAGE="اللغة العربية بالكود الموحد" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR -BUILD_INCOMPLETE_TEXT="يبدو أنك تحاول تشغيل جوملا! من مستودع git الخاص بك. للقيام بذلك يتطلب منك إكمال خطوتين إضافيتين أولاً." -BUILD_INCOMPLETE_URL_TEXT="[ المزيد من التفاصيل %s]" +BUILD_INCOMPLETE_TEXT="يبدو أنك تحاول تشغيل جوملا! من مستودع git الخاص بنا. يتطلب هذا منك إكمال خطوتين إضافيتين أولاً." +BUILD_INCOMPLETE_URL_TEXT="المزيد من التفاصيل" ; These will be processed by the JavaScript Build -BUILD_NOXML_HEADER="عذرا ، PHP الخاص بك يفتقد مكتبة حيوية" +BUILD_NOXML_HEADER="عذرًا، PHP الخاص بك يفتقد مكتبة حيوية" BUILD_NOXML_LANGUAGE="اللغة العربية بالكود الموحد" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR -BUILD_NOXML_TEXT="يحتاج مضيفك إلى استخدام PHP مع دعم مكتبة XML لتشغيل هذا الإصدار من جوملا!" +BUILD_NOXML_TEXT="يحتاج الخادم الخاص بك إلى استخدام PHP مع دعم مكتبة XML لتشغيل هذا الإصدار من جوملا!" BUILD_NOXML_URL_TEXT="ساعدني في حل هذا" ; These will be processed by the JavaScript Build -BUILD_MIN_PHP_ERROR_HEADER="عذرًا ، إصدار PHP الخاص بك غير مدعوم." +BUILD_MIN_PHP_ERROR_HEADER="عذرًا، إصدار PHP الخاص بك غير مدعوم." BUILD_MIN_PHP_ERROR_LANGUAGE="اللغة العربية بالكود الموحد" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR -BUILD_MIN_PHP_ERROR_TEXT="يحتاج مضيفك إلى استخدام إصدار PHP {{phpversion}} أو أحدث لتشغيل هذا الإصدار من جوملا." +BUILD_MIN_PHP_ERROR_TEXT="يحتاج الخادم الخاص بك إلى استخدام إصدار PHP {{phpversion}} أو أحدث لتشغيل هذا الإصدار من جوملا." BUILD_MIN_PHP_ERROR_URL_TEXT="ساعدني في حل هذا" ; Main Config -INSTL_SELECT_INSTALL_LANG="حدد لغة التنصيب" -INSTL_SELECT_LANGUAGE_TITLE="اختار اللغة" +INSTL_SELECT_INSTALL_LANG="حدد لغة التثبيت" +INSTL_SELECT_LANGUAGE_TITLE="اختر اللغة" INSTL_SETUP_LOGIN_DATA="إعداد بيانات تسجيل الدخول" -INSTL_WARNJAVASCRIPT="تحذير! يجب تمكين الجافا سكريبت لكي يتم تثبيت نظتم جوملا! بشكل صحيح" -INSTL_WARNJSON="PHP خلال تثبيتكم JSON للتمكن من تثيت جوملا . يجب تفعيل" +INSTL_WARNJAVASCRIPT="تحذير! يجب تمكين الجافاسكربت لكي يتم تثبيت نظام جوملا! بشكل صحيح." +INSTL_WARNJSON="يجب تفعيل JSON في نسخة PHP الخاصة بك لتتمكن من تثبيت جوملا!" ; Precheck view INSTL_DATABASE_SUPPORT="دعم قاعدة البيانات:" INSTL_JSON_SUPPORT_AVAILABLE="دعم JSON" @@ -37,15 +37,15 @@ INSTL_MB_LANGUAGE_IS_DEFAULT="استخدام لغة افتراضية متعدد ; Deprecated, will be removed with 6.0 INSTL_MB_STRING_OVERLOAD_OFF="إيقاف التحميل الزائد للسلسة متعددة وحدات البايت" INSTL_NOTICE_DATABASE_SUPPORT="لم يتم العثور على قواعد البيانات المدعومة." -INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="PHP خلال تثبيتكم JSON للتمكن من تثيت جوملا . يجب تفعيل" -INSTL_NOTICE_MBLANG_NOTDEFAULT="لم يتم تعيين لغة PHP mbstring على الحيادية. يمكن تعيين ذلك محليًا عن طريق إدخال php_value mbstring.languageutral في ملف .htaccess الخاص بك." +INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="يجب تفعيل JSON في نسخة PHP الخاصة بك لتتمكن من تثبيت جوملا!" +INSTL_NOTICE_MBLANG_NOTDEFAULT="لم يتم تعيين لغة PHP mbstring على الحيادية. يمكن تعيين ذلك محليًا عن طريق إدخال php_value mbstring.languageutral في مِلَفّ .htaccess الخاص بك." ; Deprecated, will be removed with 6.0 -INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="تم تعيين overload دالة PHP mbstring. يمكن إيقاف تشغيل هذا محليًا عن طريق إدخال php_value mbstring.func_overload 0 في ملف .htaccess الخاص بك." +INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="تم تعيين overload دالة PHP mbstring. يمكن إيقاف تشغيل هذه محليًا عن طريق إدخال php_value mbstring.func_overload 0 في مِلَفّ .htaccess الخاص بك." INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="وظائف php المطلوبة parse_ini_file و parse_ini_string معطلة على الخادم الخاص بك." INSTL_NOTICE_XML_SUPPORT="دعم XML غير متوفر. يجب تمكين هذا افتراضيًا في php ولكن قد يحتاج مستخدمو Ubuntu إلى تثبيت هذا عن طريق إجراء sudo apt-get install php-xml متبوعًا بإعادة تشغيل خادم الويب." INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="لم يتم تعيين ضغط Zlib. يمكن تشغيل هذا محليًا عن طريق إدخال zlib.output_compression = On في ملف php.ini ." INSTL_PARSE_INI_FILE_AVAILABLE="دعم محلل INI" -INSTL_PRECHECK_ACTUAL="حالياً" +INSTL_PRECHECK_ACTUAL="حاليًا" INSTL_PRECHECK_DESC="إذا كان أي من هذه المناصر غير مدعوم \"أي غير متوفر\" سيكون مكتوب باللون الأحمر (لا) عندها يرجى القيام بالإجراءات اللازمة لتصحيحها.
لا يمكنك تنصيب جوملا! حتى توفير الإعدادت المطلوبة أدناه." INSTL_PRECHECK_DIRECTIVE="التوجيهات" INSTL_PRECHECK_RECOMMENDED="ينصح بها" @@ -81,10 +81,13 @@ INSTL_DATABASE_NAME_LABEL="اسم قاعدة البيانات" INSTL_DATABASE_NAME_MSG_MYSQL="اسم قاعدة البيانات غير صالح. يجب ألا يحتوي على الأحرف التالية: \ /" INSTL_DATABASE_NAME_MSG_POSTGRES="اسم قاعدة البيانات غير صالح. يجب أن يبدأ بحرف ، متبوعًا بأحرف أبجدية رقمية." INSTL_DATABASE_NO_SCHEMA="لايوجد مخطط لقاعدة البيانات متوفرة لهذا النوع من قواعد البيانات." +INSTL_DATABASE_PASSWORD_DESC="أدخل كلمة مرور قاعدة البيانات التي قمت بإنشائها أو كلمة المرور المقدمة من مزود خدمة الاستضافة الخاص بك." INSTL_DATABASE_PREFIX_DESC="قم باختيار بادئة الجداول او يتم اختيارها عشوائيا. المستحسن, ان يكون عدد الحروف اربعة أو خمسة, تحتوي على حروف فقط, و يفترض ان تكون النهاية بالسطر السفلي. يجب التأكد أن البادئة ليست مستعملة لصفوف اخرى في قاعدة البيانات." +INSTL_DATABASE_PREFIX_DUPLICATE_DESC="إذا كنت تستخدم قاعدة بيانات موجودة مع جداول بنفس البادئة، سيقوم جوملا بإعادة تسمية الجداول الموجودة وذلك بإضافة البادئة \"bak_\"." INSTL_DATABASE_PREFIX_MSG="بادئة الجداول يجب أن تبدأ بحرف، يتبعه عدد اختياري من الحروف والأرقام وينتهي بالشرطة السفلية(_)." INSTL_DATABASE_RESPONSE_ERROR="فشلت عملية التنصيب." INSTL_DATABASE_TYPE_DESC="هذه على الأرجح \"MySQLi\"" +INSTL_DATABASE_USER_DESC="أدخل اسم مستخدم قاعدة البيانات التي قمت بإنشائها أو اسم المستخدم الذي حصلت عليه من مزود خدمة الاستضافة الخاص بك." INSTL_DATABASE_VALIDATION_ERROR="تحقق من بيانات اعتماد قاعدة البيانات أو نوع قاعدة البيانات أو اسم قاعدة البيانات أو اسم المضيف. إذا كان لديك MySQL 8 مثبتًا ، فالرجاء قراءة توضيحات لمزيد من المعلومات." INSTL_CONNECT_DB="إعداد اتصال قاعدة البيانات" @@ -100,6 +103,9 @@ INSTL_SETUP_SITE_NAME="إعداد اسم الموقع" INSTL_SITE="الإعدادات الرئيسية" INSTL_SITE_DEVMODE_LABEL="اكتشفنا وضع التطوير development mode" INSTL_SITE_NAME_DESC="أدخل اسم الموقع الخاص بك المبني بجوملا!." +; Expert View +INSTL_PUBLIC_FOLDER_DESC="المسار النسبي أو المطلق إلى المجلد العام" +INSTL_PUBLIC_FOLDER_DESC_SHORT="المسار النسبي أو المطلق إلى المجلد العام" ; Complete view INSTL_COMPLETE_ERROR_FOLDER_DELETE="تعذر حذف مجلد \"%s\" . يرجى القيام بحذفه بشكل يدوي." INSTL_COMPLETE_REMOVE_FOLDER="يرجى إزالة مجلد \"%s\"" @@ -117,7 +123,10 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="اللغة" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="اختار اللغة" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="كود اللغة" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="الاصدار" +INSTL_LANGUAGES_DESC="واجهة Joomla متاحة بعدة لغات. اختر لغاتك المفضلة عن طريق اختيار خانات الاختيار ثم تثبيتها عن طريق تحديد زر \"تثبيت اللغات المحددة\".
ملاحظة: هذه العملية ستستغرق حوالي 10 ثوان لتنزيل وتثبيت كل لغة. لتجنب المهلة الزمنية يرجى تحديد ما لا يزيد عن 3 لغات للتثبيت." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="ستستغرق هذه العملية ما يصل إلى 10 ثوان في كل لغة للإكتمال
الرجاء الانتظار بينما نقوم بتنزيل وتثبيت اللغات …" INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="لطفاً, حدد اللغة. إن لم تكن تريد تنصيب المزيد من اللغات فانقر على زر 'السابق' " +INSTL_LANGUAGES_SELECTED="قم بتثبيت اللغات المحددة" INSTL_LANGUAGES_WARNING_NO_INTERNET="لم تتمكن جوملا! من الاتصال بسيرفر اللغات. لطفاً قم بإنهاء عملية التنصيب." INSTL_LANGUAGES_WARNING_NO_INTERNET2="ملاحظة: سيكون متاحاً لك تنصيب اللغات أيضا من لوحة تحكم جوملا!" INSTL_LANGUAGES_WARNING_BACK_BUTTON="العودة للمرحلة الأخيرة من التنصيب" @@ -186,6 +195,7 @@ INSTL_NOTICE_NEEDSTOBEWRITABLE="لا يزال بإمكانك متابعة الت INSTL_OUTPUT_BUFFERING="تخزين المخرجات Output Buffering" INSTL_PHP_VERSION="نسخة PHP" INSTL_PHP_VERSION_NEWER="إصدار PHP >= %s" +INSTL_PROCESS_BUSY="العملية قيد الإجراء. الرجاء الانتظار …" INSTL_SESSION_AUTO_START="بداية تلقائية للجلسة Session auto start" INSTL_WRITABLE="%s قابل للكتابة" INSTL_ZIP_SUPPORT_AVAILABLE="توفر ZIP خاصية فك الملفات المضغوطة" @@ -201,6 +211,7 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="لايوجد نتائج مشابهة" JGLOBAL_SELECT_SOME_OPTIONS="حدد بعض الخيارات" JHIDEPASSWORD="إخفاء كلمة المرور" JINVALID_TOKEN="رمز غير صالح" +JINVALID_TOKEN_NOTICE="قيم الكود الأمني غير متوافقة. تم رفض الطلب تفاديًا لأي خرق أمني محتمل. لطفاً حاول مرة أخرى." JNEXT="التالي" JNO="ابدا" JNOTICE="ملاحظة" @@ -222,6 +233,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="JFolder: :حذف: المسار لا JLIB_FORM_FIELD_INVALID="حقل غير صحيح: " JLIB_FORM_VALIDATE_FIELD_INVALID="حقل غير صالح: %s" JLIB_FORM_VALIDATE_FIELD_REQUIRED="حقل مطلوب: %s" +JLIB_INSTALLER_ABORT="إيقاف تثبيت اللغة: %s" JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="التطبيق %1$s: فشل انشاء الدليل باسم: %2$s" JLIB_INSTALLER_ABORT_NOINSTALLPATH="مسار التنصيب غير موجود" JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="الحزمة %1$s: حصل خطأ عند محاولة تنصيب الاضافة: %2$s" @@ -234,6 +246,7 @@ JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="تعذر إنشاء JLIB_UPDATER_ERROR_COLLECTION_FOPEN="الدالة allow_url_fopen غير مفعلة. يجب تفعيلها كي تتم عملية التحديث." JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: غير قادر على فتح %s" JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: لا يمكن تحليل %s" +JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="تحديث: تعذر فتح موقع التحديث #%d "%s", الرابط: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: تعذر الاتصال بقاعدة البيانات
joomla.library: %1$s - %2$s" ; Strings for the language debugger JDEBUG_LANGUAGE_FILES_IN_ERROR="تحليل الأخطاء في ملفات اللغة" @@ -256,6 +269,7 @@ MESSAGE="الرسالة" NOTICE="ملاحظة" WARNING="تحذير" ; Javascript ajax error messages +JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="فشل الاتصال عند محاولة الحصول على بيانات JSON." JLIB_JS_AJAX_ERROR_NO_CONTENT="لايمكن استعادة المحتوى." JLIB_JS_AJAX_ERROR_OTHER="حدث خطأ أثناء جلب البيانات JSON: HTTP %s حالة الكود." JLIB_JS_AJAX_ERROR_PARSE="حدث خطأ في تحليل أثناء معالجة البيانات JSON التالية:
%s" @@ -271,4 +285,9 @@ JLIB_FORM_CONTAINS_INVALID_FIELDS="لا يمكن إرسال النموذج لأ JLIB_FORM_FIELD_INVALID_VALUE="هذه القيمة غير صالحة." JLIB_FORM_FIELD_REQUIRED_CHECK="يجب تحديد أحد الخيارات." JLIB_FORM_FIELD_REQUIRED_VALUE="يرجى ملء هذا الحقل." +; Installation progress screen +INSTL="تثبيت" +INSTL_FINISHED="تم التثبيت" +INSTL_IN_PROGRESS="يتم التثبيت" +INSTL_PROGRESS="حالة التثبيت" diff --git a/installation/language/ar-AA/langmetadata.xml b/installation/language/ar-AA/langmetadata.xml index 4892918e94a26..fb9bde34a048b 100644 --- a/installation/language/ar-AA/langmetadata.xml +++ b/installation/language/ar-AA/langmetadata.xml @@ -1,7 +1,7 @@ Arabic (اللغة العربية) - 5.2.6 + 5.3.0 2025-03 Dr. Ashraf Damra (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/be-BY/langmetadata.xml b/installation/language/be-BY/langmetadata.xml index a87daa37a96c6..f486c68cb66d1 100644 --- a/installation/language/be-BY/langmetadata.xml +++ b/installation/language/be-BY/langmetadata.xml @@ -1,7 +1,7 @@ Belarusian (Belarus) - 5.2.6 + 5.3.0 2025-03 Joomla Belarus Community (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/bg-BG/langmetadata.xml b/installation/language/bg-BG/langmetadata.xml index 546af945e0fab..bc782bb8cfbf5 100644 --- a/installation/language/bg-BG/langmetadata.xml +++ b/installation/language/bg-BG/langmetadata.xml @@ -1,7 +1,7 @@ Bulgarian (bg-BG) - 5.2.6 + 5.3.0 2025-03 Joomla! Bulgaria (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ca-ES/langmetadata.xml b/installation/language/ca-ES/langmetadata.xml index 7df984c866e69..a8192909fe047 100644 --- a/installation/language/ca-ES/langmetadata.xml +++ b/installation/language/ca-ES/langmetadata.xml @@ -1,7 +1,7 @@ Catalan (ca-ES) - 5.2.6 + 5.3.0 2025-03 Catalan [ca-ES] Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/cs-CZ/langmetadata.xml b/installation/language/cs-CZ/langmetadata.xml index 1cbbaf396e95f..89c09b47c0f2f 100644 --- a/installation/language/cs-CZ/langmetadata.xml +++ b/installation/language/cs-CZ/langmetadata.xml @@ -1,7 +1,7 @@ Czech (Čeština) - 5.2.6 + 5.3.0 2025-03 Czech Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/cy-GB/langmetadata.xml b/installation/language/cy-GB/langmetadata.xml index f4c5c2d9ac833..e49c557d14795 100644 --- a/installation/language/cy-GB/langmetadata.xml +++ b/installation/language/cy-GB/langmetadata.xml @@ -1,7 +1,7 @@ Welsh (United Kingdom) - 5.2.6 + 5.3.0 2025-03 Joomla! Project - Welsh Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/da-DK/langmetadata.xml b/installation/language/da-DK/langmetadata.xml index a4934d9430a11..b0c69da8debc1 100644 --- a/installation/language/da-DK/langmetadata.xml +++ b/installation/language/da-DK/langmetadata.xml @@ -1,7 +1,7 @@ Danish (Danmark) - 5.2.6 + 5.3.0 2025-03 Danish Translation Team (Transl.: Ronny Buelund) (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/de-AT/langmetadata.xml b/installation/language/de-AT/langmetadata.xml index 5256f573bfb68..b59efab926338 100644 --- a/installation/language/de-AT/langmetadata.xml +++ b/installation/language/de-AT/langmetadata.xml @@ -1,8 +1,8 @@ German (Austria) - 5.2.3 - 2025-01 + 5.3.0 + 2025-04 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-CH/langmetadata.xml b/installation/language/de-CH/langmetadata.xml index 4b6854cae98d1..5e26938c292b3 100644 --- a/installation/language/de-CH/langmetadata.xml +++ b/installation/language/de-CH/langmetadata.xml @@ -1,8 +1,8 @@ German (Switzerland) - 5.2.3 - 2025-01 + 5.3.0 + 2025-04 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-DE/langmetadata.xml b/installation/language/de-DE/langmetadata.xml index 3cd4d882526d2..0b937660985c3 100644 --- a/installation/language/de-DE/langmetadata.xml +++ b/installation/language/de-DE/langmetadata.xml @@ -1,8 +1,8 @@ German (Germany) - 5.2.3 - 2025-01 + 5.3.0 + 2025-04 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-LI/langmetadata.xml b/installation/language/de-LI/langmetadata.xml index 6ffe9f219a3ea..6f0cf20019ab7 100644 --- a/installation/language/de-LI/langmetadata.xml +++ b/installation/language/de-LI/langmetadata.xml @@ -1,8 +1,8 @@ German (Liechtenstein) - 5.2.3 - 2025-01 + 5.3.0 + 2025-04 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-LU/langmetadata.xml b/installation/language/de-LU/langmetadata.xml index f52a1f0754feb..c5bf9121bc466 100644 --- a/installation/language/de-LU/langmetadata.xml +++ b/installation/language/de-LU/langmetadata.xml @@ -1,8 +1,8 @@ German (Luxembourg) - 5.2.3 - 2025-01 + 5.3.0 + 2025-04 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/el-GR/langmetadata.xml b/installation/language/el-GR/langmetadata.xml index f7be87a4c11f3..4504a2cbee69e 100644 --- a/installation/language/el-GR/langmetadata.xml +++ b/installation/language/el-GR/langmetadata.xml @@ -1,7 +1,7 @@ Greek (el-GR) - 5.2.6 + 5.3.0 2025-03 Ομάδα Μετάφρασης: joomla. gr (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/en-AU/langmetadata.xml b/installation/language/en-AU/langmetadata.xml index dac22a4d661cc..eed723822a6fb 100644 --- a/installation/language/en-AU/langmetadata.xml +++ b/installation/language/en-AU/langmetadata.xml @@ -1,7 +1,7 @@ English (Australia) - 5.2.6 + 5.3.0 2025-03 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/en-CA/langmetadata.xml b/installation/language/en-CA/langmetadata.xml index b33df7968f542..4b66cf45c8216 100644 --- a/installation/language/en-CA/langmetadata.xml +++ b/installation/language/en-CA/langmetadata.xml @@ -1,7 +1,7 @@ English (Canada) - 5.2.6 + 5.3.0 2025-03 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/en-NZ/langmetadata.xml b/installation/language/en-NZ/langmetadata.xml index adabc7beb3b1f..267f0ed0312ba 100644 --- a/installation/language/en-NZ/langmetadata.xml +++ b/installation/language/en-NZ/langmetadata.xml @@ -1,7 +1,7 @@ English (New Zealand) - 5.2.6 + 5.3.0 2025-03 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/en-US/langmetadata.xml b/installation/language/en-US/langmetadata.xml index 4fda553e48afe..496a5b43fb214 100644 --- a/installation/language/en-US/langmetadata.xml +++ b/installation/language/en-US/langmetadata.xml @@ -1,7 +1,7 @@ English (United States) - 5.2.6 + 5.3.0 2025-03 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/es-ES/langmetadata.xml b/installation/language/es-ES/langmetadata.xml index 69d61c942d154..4a384c3615599 100644 --- a/installation/language/es-ES/langmetadata.xml +++ b/installation/language/es-ES/langmetadata.xml @@ -1,7 +1,7 @@ Spanish (es-ES) - 5.2.6 + 5.3.0 2025-03 Spanish [es-ES] Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/et-EE/langmetadata.xml b/installation/language/et-EE/langmetadata.xml index 3d06146bc17bb..e5f88243566bd 100644 --- a/installation/language/et-EE/langmetadata.xml +++ b/installation/language/et-EE/langmetadata.xml @@ -1,7 +1,7 @@ Estonian - 5.2.6 + 5.3.0 2025-03 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/eu-ES/langmetadata.xml b/installation/language/eu-ES/langmetadata.xml index 1d89d8989b1ff..d8f90178b24a4 100644 --- a/installation/language/eu-ES/langmetadata.xml +++ b/installation/language/eu-ES/langmetadata.xml @@ -1,7 +1,7 @@ Basque - 5.2.6 + 5.3.0 2025-03 Joomla! Basque Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/fa-AF/langmetadata.xml b/installation/language/fa-AF/langmetadata.xml index 36644e9563895..3115546bc778d 100644 --- a/installation/language/fa-AF/langmetadata.xml +++ b/installation/language/fa-AF/langmetadata.xml @@ -1,7 +1,7 @@ فارسی (دری) - 5.2.6 + 5.3.0 2025-03 JoomlaPersian Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/fa-IR/langmetadata.xml b/installation/language/fa-IR/langmetadata.xml index 737231786a127..ca68255ce1ae7 100644 --- a/installation/language/fa-IR/langmetadata.xml +++ b/installation/language/fa-IR/langmetadata.xml @@ -1,7 +1,7 @@ Persian (fa-IR) - 5.2.6 + 5.3.0 2025-03 Persian Translation Team: joomlafarsi.com (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/fi-FI/langmetadata.xml b/installation/language/fi-FI/langmetadata.xml index 6e756b61be0ea..4f9dc7297d927 100644 --- a/installation/language/fi-FI/langmetadata.xml +++ b/installation/language/fi-FI/langmetadata.xml @@ -1,7 +1,7 @@ Finnish (Finland) - 5.2.6 + 5.3.0 2025-03 Finnish translation team: Joomla.fi (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/fr-CA/langmetadata.xml b/installation/language/fr-CA/langmetadata.xml index 357127b6fa879..cfafd16ea768c 100644 --- a/installation/language/fr-CA/langmetadata.xml +++ b/installation/language/fr-CA/langmetadata.xml @@ -1,7 +1,7 @@ French (Canada) - 5.2.6 + 5.3.0 2025-03 Joomla! Project - French translation team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/fr-FR/langmetadata.xml b/installation/language/fr-FR/langmetadata.xml index 316a734d532dc..7cf2dc185b608 100644 --- a/installation/language/fr-FR/langmetadata.xml +++ b/installation/language/fr-FR/langmetadata.xml @@ -1,7 +1,7 @@ French (fr-FR) - 5.2.6 + 5.3.0 2025-03 Joomla! Project - French translation team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/he-IL/langmetadata.xml b/installation/language/he-IL/langmetadata.xml index 9a67f26577f3e..af55740854df2 100644 --- a/installation/language/he-IL/langmetadata.xml +++ b/installation/language/he-IL/langmetadata.xml @@ -1,7 +1,7 @@ Hebrew (Israel) - 5.2.6 + 5.3.0 2025-03 פרוייקט ג'ומלה (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/hr-HR/langmetadata.xml b/installation/language/hr-HR/langmetadata.xml index a1de10b45d7b4..d18e31d1d7d93 100644 --- a/installation/language/hr-HR/langmetadata.xml +++ b/installation/language/hr-HR/langmetadata.xml @@ -1,7 +1,7 @@ Hrvatski (Hrvatska) - 5.2.6 + 5.3.0 2025-03 Joomla! Hrvatska team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/hu-HU/langmetadata.xml b/installation/language/hu-HU/langmetadata.xml index 088a035db97fa..8c230b85db912 100644 --- a/installation/language/hu-HU/langmetadata.xml +++ b/installation/language/hu-HU/langmetadata.xml @@ -1,7 +1,7 @@ Hungarian (Magyar) - 5.2.6 + 5.3.0 2025-03 Joomla! Magyarország (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/id-ID/langmetadata.xml b/installation/language/id-ID/langmetadata.xml index e6c89a2499e43..20d2afb15cff8 100644 --- a/installation/language/id-ID/langmetadata.xml +++ b/installation/language/id-ID/langmetadata.xml @@ -1,7 +1,7 @@ Bahasa Indonesia (id-ID) - 5.2.6 + 5.3.0 2025-03 Joomla! Indonesia (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/it-IT/langmetadata.xml b/installation/language/it-IT/langmetadata.xml index f678fa2c406e9..7f9b872db34df 100644 --- a/installation/language/it-IT/langmetadata.xml +++ b/installation/language/it-IT/langmetadata.xml @@ -1,7 +1,7 @@ Italiano (it-IT) - 5.2.6 + 5.3.0 2025-03 Joomla! Project (Italian Translation Team) (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ja-JP/langmetadata.xml b/installation/language/ja-JP/langmetadata.xml index ebea6229b438a..041b92a850ebf 100644 --- a/installation/language/ja-JP/langmetadata.xml +++ b/installation/language/ja-JP/langmetadata.xml @@ -1,7 +1,7 @@ Japanese (Japan) - 5.2.6 + 5.3.0 2025-03 Joomla!じゃぱん (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ka-GE/langmetadata.xml b/installation/language/ka-GE/langmetadata.xml index 3f26cb014ae9c..2d3f9537b051f 100644 --- a/installation/language/ka-GE/langmetadata.xml +++ b/installation/language/ka-GE/langmetadata.xml @@ -1,7 +1,7 @@ Georgian (Georgia) - 5.2.6 + 5.3.0 2025-03 Georgian Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/kk-KZ/langmetadata.xml b/installation/language/kk-KZ/langmetadata.xml index 9228b070b6872..48d3b91dd94af 100644 --- a/installation/language/kk-KZ/langmetadata.xml +++ b/installation/language/kk-KZ/langmetadata.xml @@ -1,7 +1,7 @@ Kazakh (Kazakhstan) - 5.2.6 + 5.3.0 2025-03 Sarvarov Akylkerey (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ko-KR/langmetadata.xml b/installation/language/ko-KR/langmetadata.xml index 8fd23ea8368bd..e04786d52016c 100644 --- a/installation/language/ko-KR/langmetadata.xml +++ b/installation/language/ko-KR/langmetadata.xml @@ -1,7 +1,7 @@ Korean (Republic of Korea) - 5.2.6 + 5.3.0 2025-03 Joomla! 프로젝트 (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/lt-LT/langmetadata.xml b/installation/language/lt-LT/langmetadata.xml index 85a3a529eb6f3..a4cf9026d63d1 100644 --- a/installation/language/lt-LT/langmetadata.xml +++ b/installation/language/lt-LT/langmetadata.xml @@ -1,7 +1,7 @@ Lietuvių (lt-LT) - 5.2.6 + 5.3.0 2025-03 Oskaras Jankauskas (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/lv-LV/langmetadata.xml b/installation/language/lv-LV/langmetadata.xml index 0ad77d085d7c8..b1ba12bf06c44 100644 --- a/installation/language/lv-LV/langmetadata.xml +++ b/installation/language/lv-LV/langmetadata.xml @@ -1,7 +1,7 @@ Latvian (Latvia) - 5.2.6 + 5.3.0 2025-03 Joomla! Projekts (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/mk-MK/langmetadata.xml b/installation/language/mk-MK/langmetadata.xml index 323bed8f7a3db..0572f43f6f2d1 100644 --- a/installation/language/mk-MK/langmetadata.xml +++ b/installation/language/mk-MK/langmetadata.xml @@ -1,7 +1,7 @@ Macedonian (mk-MK) - 5.2.6 + 5.3.0 2025-03 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/nl-BE/joomla.ini b/installation/language/nl-BE/joomla.ini index 408b93c2cc45d..21be651f038ff 100644 --- a/installation/language/nl-BE/joomla.ini +++ b/installation/language/nl-BE/joomla.ini @@ -6,22 +6,22 @@ ; Fatal error page ; These will be processed by the JavaScript Build BUILD_FATAL_HEADER="Sorry, er deed zich een probleem voor dat we niet konden herstellen." -BUILD_FATAL_LANGUAGE="Engels GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR +BUILD_FATAL_LANGUAGE="Vlaams BE" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR BUILD_FATAL_TEXT="De server heeft een \"{{statusCode_statusText}} \" teruggestuurd" BUILD_FATAL_URL_TEXT="Help dit probleem op te lossen" ; These will be processed by the JavaScript Build BUILD_INCOMPLETE_HEADER="Omgeving instellen onvolledig" -BUILD_INCOMPLETE_LANGUAGE="Engels GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR +BUILD_INCOMPLETE_LANGUAGE="Vlaams BE" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR BUILD_INCOMPLETE_TEXT="Het lijkt erop dat u probeert Joomla! uit te voeren vanuit onze git repository. Hiervoor is vereist dat u eerst een aantal extra stappen heeft voltooid." BUILD_INCOMPLETE_URL_TEXT="Meer details" ; These will be processed by the JavaScript Build BUILD_NOXML_HEADER="Sorry, uw PHP mist een noodzakelijke library" -BUILD_NOXML_LANGUAGE="Engels GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR +BUILD_NOXML_LANGUAGE="Vlaams BE" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR BUILD_NOXML_TEXT="Om deze versie van Joomla! uit te kunnen voeren moet uw host PHP gebruiken met ondersteuning voor de XML-library" BUILD_NOXML_URL_TEXT="Help dit probleem op te lossen" ; These will be processed by the JavaScript Build BUILD_MIN_PHP_ERROR_HEADER="Sorry, uw PHP-versie wordt niet ondersteund." -BUILD_MIN_PHP_ERROR_LANGUAGE="Engels GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR +BUILD_MIN_PHP_ERROR_LANGUAGE="Vlaams BE" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR BUILD_MIN_PHP_ERROR_TEXT="Uw host moet PHP versie {{phpversion}} of nieuwer gebruiken om deze versie van Joomla uit te voeren." BUILD_MIN_PHP_ERROR_URL_TEXT="Help dit probleem op te lossen" ; Main Config @@ -81,13 +81,13 @@ INSTL_DATABASE_NAME_LABEL="Database naam" INSTL_DATABASE_NAME_MSG_MYSQL="De naam van de database is ongeldig. Het mag de volgende tekens NIET bevatten: \ /" INSTL_DATABASE_NAME_MSG_POSTGRES="De naam van de database is ongeldig. Deze moet beginnen met een letter, gevolgd door alfanumerieke tekens." INSTL_DATABASE_NO_SCHEMA="Er bestaat geen database schema voor dit database type." -INSTL_DATABASE_PASSWORD_DESC="Voer het database wachtwoord in dat is aangemaakt of een wachtwoord dat door de host is verstrekt." +INSTL_DATABASE_PASSWORD_DESC="Een wachtwoord dat uzelf heeft aangemaakt, of een wachtwoord dat door de webhost is verstrekt." INSTL_DATABASE_PREFIX_DESC="Een tabel voorvoegsel invoeren of de willekeurig gegenereerde gebruiken." INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Als een bestaande database gebruikt wordt met tabellen met dezelfde voorvoegsel, zal Joomla deze bestaande tabellen hernoemen door het voorvoegsel \"bak_\" toe te voegen." INSTL_DATABASE_PREFIX_MSG="Het voorvoegsel van de tabel moet beginnen met een letter, eventueel gevolgd door alfanumerieke tekens en een onderstrepingsteken" INSTL_DATABASE_RESPONSE_ERROR="Het installatieproces is mislukt." INSTL_DATABASE_TYPE_DESC="Selecteer het databasetype." -INSTL_DATABASE_USER_DESC="Voer de gebruikersnaam in die is aangemaakt of een gebruikersnaam die door de host is verstrekt." +INSTL_DATABASE_USER_DESC="Vul de database gebruikersnaam in die u heeft aangemaakt of een gebruikersnaam die door uw host is verstrekt." INSTL_DATABASE_VALIDATION_ERROR="Controleer uw database inloggegevens, database type, database naam of hostname. Als u MySQL 8 geïnstalleerd heeft, lees dan deze wiki voor meer informatie." INSTL_CONNECT_DB="Databaseverbinding instellen" @@ -111,8 +111,8 @@ INSTL_COMPLETE_ERROR_FOLDER_DELETE="De \"%s\" map kan niet worden verwijderd. Ve INSTL_COMPLETE_REMOVE_FOLDER="Verwijder \"%s\" map" INSTL_COMPLETE_CONGRAT="Gefeliciteerd!" INSTL_COMPLETE_TITLE="Gefeliciteerd! Uw Joomla site staat klaar." -INSTL_COMPLETE_SITE_BTN="Website openen" -INSTL_COMPLETE_ADMIN_BTN="Beheer openen" +INSTL_COMPLETE_SITE_BTN="Voltooien & website openen" +INSTL_COMPLETE_ADMIN_BTN="Voltooien & beheer openen" INSTL_COMPLETE_FINAL="Installatie is voltooid" INSTL_COMPLETE_FINAL_DESC="Uw Joomla installatie is nu voltooid en klaar voor gebruik." INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Extra talen installeren" @@ -123,8 +123,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Taal" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Selecteer taal" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Taal tag" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versie" -INSTL_LANGUAGES_DESC="De Joomla-interface is beschikbaar in verschillende talen. Kies de gewenste talen door de selectievakjes aan te vinken en deze vervolgens te installeren door op de knop \"Installeer geselecteerde talen\" te klikken.
Opmerking: Deze bewerking duurt voor elke taal ongeveer 10 seconden om te downloaden en te installeren. Selecteer, om time-outs te voorkomen, niet meer dan 3 talen om te installeren." -INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Deze bewerking duurt maximaal 10 seconden per taal om te voltooien
Een ogenblik geduld, terwijl we de talen downloaden en installeren …" +INSTL_LANGUAGES_DESC="De Joomla-interface is beschikbaar in verschillende talen. Kies de gewenste talen door de selectievakjes aan te vinken en deze vervolgens te installeren door op de knop 'Volgende' te klikken.
Opmerking: Deze bewerking duurt voor elke taal ongeveer 10 seconden om te downloaden en te installeren. Om time-outs te voorkomen, selecteert u niet meer dan 3 talen om te installeren." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Deze bewerking duurt maximaal 10 seconden per taal om te voltooien
Een ogenblik geduld, terwijl we de talen downloaden en installeren ..." INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Er zijn geen talen geselecteerd om te installeren." INSTL_LANGUAGES_SELECTED="Installeer geselecteerde talen" INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! kon niet verbinden met de taalserver. Voltooi het installatieproces." @@ -147,7 +147,7 @@ INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla heeft %s ingesteld als uw sta INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standaardtaal instellen" INSTL_DEFAULTLANGUAGE_TRY_LATER="U kunt het later installeren met behulp van Joomla beheer." -INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Vlaams (BE)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Flemish (BE)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español ; Database Model INSTL_DATABASE_COULD_NOT_CONNECT="Kan geen verbinding maken met de database. Foutmelding: %s" INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="De installatie kan niet met de gespecificeerde database verbinden en kan geen database aanmaken. Controleer uw instellingen en maak, indien nodig, handmatig de database aan." @@ -211,9 +211,9 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="Geen overeenkomende resultaten" JGLOBAL_SELECT_SOME_OPTIONS="Selecteer enkele opties" JHIDEPASSWORD="Verberg wachtwoord" JINVALID_TOKEN="Het laatste verzoek is geweigerd omdat het een ongeldig beveiligingstoken bevat. Vernieuw de pagina en probeer het opnieuw." -JINVALID_TOKEN_NOTICE="Het beveiligingstoken komt niet overeen. Het verzoek is geannuleerd om een inbreuk op de beveiliging te voorkomen. Probeer het opnieuw." +JINVALID_TOKEN_NOTICE="Het beveiligingstoken komt niet overeen. Het verzoek werd afgebroken om een inbreuk op de beveiliging te voorkomen. Probeer nogmaals." JNEXT="Volgende" -JNO="Nee" +JNO="Neen" JNOTICE="Opmerking" JOFF="Uit" JON="Aan" @@ -233,7 +233,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Pad is geen map. Pad: %2$s" JLIB_FORM_FIELD_INVALID="Ongeldig veld: " JLIB_FORM_VALIDATE_FIELD_INVALID="Ongeldig veld: %s" JLIB_FORM_VALIDATE_FIELD_REQUIRED="Vereist veld: %s" -JLIB_INSTALLER_ABORT="Installeren taal afgebroken: %s" +JLIB_INSTALLER_ABORT="De taalinstallatie wordt gestopt: %s" JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extensie %1$s: Aanmaken map mislukt: %2$s" JLIB_INSTALLER_ABORT_NOINSTALLPATH="Installatiepad bestaat niet." JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Pakket %1$s: Er is een fout opgetreden bij het installeren van een extensie: %2$s." @@ -269,7 +269,7 @@ MESSAGE="Bericht" NOTICE="Opmerking" WARNING="Waarschuwing" ; Javascript ajax error messages -JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Er is een verbindingsfout opgetreden bij het ophalen van de JSON-gegevens." +JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="De verbinding werd afgebroken tijdens het ophalen van de JSON data." JLIB_JS_AJAX_ERROR_NO_CONTENT="Er werd geen inhoud teruggegeven." JLIB_JS_AJAX_ERROR_OTHER="Er deed zich een fout voor tijdens het ophalen van de JSON data: HTTP %d status code." JLIB_JS_AJAX_ERROR_PARSE="Er deed zich een ontledingsfout voor bij het verwerken van de volgende JSON data:
%s" diff --git a/installation/language/nl-BE/langmetadata.xml b/installation/language/nl-BE/langmetadata.xml index 9d0526b32dec8..29009f9eb8215 100644 --- a/installation/language/nl-BE/langmetadata.xml +++ b/installation/language/nl-BE/langmetadata.xml @@ -1,17 +1,17 @@ - Dutch (Belgium) - 5.2.6 + Vlaams (België) + 5.3.0 2025-03 - Dutch (BE) translation team + Vlaams (BE) translation team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt joomla.ini - Dutch (nl-BE) - Dutch (Belgium) + Vlaams (nl-BE) + Vlaams (België) nl-BE 0 diff --git a/installation/language/nl-NL/langmetadata.xml b/installation/language/nl-NL/langmetadata.xml index e06028691dceb..e8d3a72973d00 100644 --- a/installation/language/nl-NL/langmetadata.xml +++ b/installation/language/nl-NL/langmetadata.xml @@ -1,7 +1,7 @@ Dutch (Netherlands) - 5.2.6 + 5.3.0 2025-03 Dutch Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/pl-PL/langmetadata.xml b/installation/language/pl-PL/langmetadata.xml index c79a73756481e..dae3d25776890 100644 --- a/installation/language/pl-PL/langmetadata.xml +++ b/installation/language/pl-PL/langmetadata.xml @@ -1,7 +1,7 @@ Polski (PL) - 5.2.6 + 5.3.0 2025-03 Projekt Joomla! (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/pt-BR/langmetadata.xml b/installation/language/pt-BR/langmetadata.xml index b8261fda4ccde..f5c1943ff56a5 100644 --- a/installation/language/pt-BR/langmetadata.xml +++ b/installation/language/pt-BR/langmetadata.xml @@ -1,7 +1,7 @@ Portuguese (Brazil) - 5.2.6 + 5.3.0 2025-03 Projeto Joomla! (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/pt-PT/langmetadata.xml b/installation/language/pt-PT/langmetadata.xml index c3e93ca18d009..636664d59e98c 100644 --- a/installation/language/pt-PT/langmetadata.xml +++ b/installation/language/pt-PT/langmetadata.xml @@ -1,7 +1,7 @@ Português (Portugal) - 5.2.6 + 5.3.0 2025-03 Comunidade JoomlaPortugal (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ro-RO/langmetadata.xml b/installation/language/ro-RO/langmetadata.xml index 9011dae5426d1..7f4c84e79e223 100644 --- a/installation/language/ro-RO/langmetadata.xml +++ b/installation/language/ro-RO/langmetadata.xml @@ -1,7 +1,7 @@ Română (România) - 5.2.6 + 5.3.0 2025-03 Horia Negura - Quanta (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/sk-SK/langmetadata.xml b/installation/language/sk-SK/langmetadata.xml index d941835729e92..1c4e3ae596781 100644 --- a/installation/language/sk-SK/langmetadata.xml +++ b/installation/language/sk-SK/langmetadata.xml @@ -1,7 +1,7 @@ Slovak (Slovakia) - 5.2.6 + 5.3.0 2025-03 Slovak translation team : Peter Michnica (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/sl-SI/langmetadata.xml b/installation/language/sl-SI/langmetadata.xml index f3621a84119fa..51c5c3c326912 100644 --- a/installation/language/sl-SI/langmetadata.xml +++ b/installation/language/sl-SI/langmetadata.xml @@ -1,7 +1,7 @@ Slovenščina (Slovenija) - 5.2.6 + 5.3.0 2025-03 Slovenska prevajalska ekipa (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/sr-YU/langmetadata.xml b/installation/language/sr-YU/langmetadata.xml index 9b6c2a4c9559f..3ea542c724bc2 100644 --- a/installation/language/sr-YU/langmetadata.xml +++ b/installation/language/sr-YU/langmetadata.xml @@ -1,7 +1,7 @@ Srpski (Republika Srbija) - 5.2.6 + 5.3.0 2025-03 Goran Nešić - UIX Web Design & Saša Matić Bardak.RS (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/sv-SE/langmetadata.xml b/installation/language/sv-SE/langmetadata.xml index 6b2795b7c0401..93aa6bd811252 100644 --- a/installation/language/sv-SE/langmetadata.xml +++ b/installation/language/sv-SE/langmetadata.xml @@ -1,7 +1,7 @@ Swedish (Sweden) - 5.2.6 + 5.3.0 2025-03 Swedish Translation Team - SvenskJoomla (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ta-IN/langmetadata.xml b/installation/language/ta-IN/langmetadata.xml index f89f1ab7b35e0..79951b1d7e3f2 100644 --- a/installation/language/ta-IN/langmetadata.xml +++ b/installation/language/ta-IN/langmetadata.xml @@ -1,7 +1,7 @@ Tamil (India) - 5.2.6 + 5.3.0 2025-03 Ilagnayeru 'MIG' Manickam, Elango Samy Manim (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/th-TH/langmetadata.xml b/installation/language/th-TH/langmetadata.xml index c674e748eb0f7..06949a14f643e 100644 --- a/installation/language/th-TH/langmetadata.xml +++ b/installation/language/th-TH/langmetadata.xml @@ -1,7 +1,7 @@ Thai (ภาษาไทย) - 5.2.6 + 5.3.0 2025-03 Thai Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/tr-TR/langmetadata.xml b/installation/language/tr-TR/langmetadata.xml index 670840d902fad..e5264df08d388 100644 --- a/installation/language/tr-TR/langmetadata.xml +++ b/installation/language/tr-TR/langmetadata.xml @@ -1,7 +1,7 @@ Turkish (Turkey) - 5.2.6 + 5.3.0 2025-03 Joomla! Türkiye (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/uk-UA/langmetadata.xml b/installation/language/uk-UA/langmetadata.xml index e205e8ab9dbf0..5ecab46017997 100644 --- a/installation/language/uk-UA/langmetadata.xml +++ b/installation/language/uk-UA/langmetadata.xml @@ -1,7 +1,7 @@ Ukrainian (uk-UA) - 5.2.6 + 5.3.0 2025-03 Denys Nosov (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ur-PK/langmetadata.xml b/installation/language/ur-PK/langmetadata.xml index 0626a3ffbeff4..380a59748da17 100644 --- a/installation/language/ur-PK/langmetadata.xml +++ b/installation/language/ur-PK/langmetadata.xml @@ -1,7 +1,7 @@ Urdu (ur-PK) - 5.2.6 + 5.3.0 2025-03 Urdu Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/vi-VN/langmetadata.xml b/installation/language/vi-VN/langmetadata.xml index 9148fea1b0874..dedc4564caa6d 100644 --- a/installation/language/vi-VN/langmetadata.xml +++ b/installation/language/vi-VN/langmetadata.xml @@ -1,7 +1,7 @@ Vietnamese (Vietnam) - 5.2.6 + 5.3.0 2025-03 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/zh-CN/langmetadata.xml b/installation/language/zh-CN/langmetadata.xml index 1d6dd9918ab30..3c4f94c10d4f8 100644 --- a/installation/language/zh-CN/langmetadata.xml +++ b/installation/language/zh-CN/langmetadata.xml @@ -1,7 +1,7 @@ Chinese Simplified (China) - 5.2.6 + 5.3.0 2025-03 Joomla中文网 (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/zh-TW/langmetadata.xml b/installation/language/zh-TW/langmetadata.xml index 0f4a96015ae1e..7da1e7e9136b9 100644 --- a/installation/language/zh-TW/langmetadata.xml +++ b/installation/language/zh-TW/langmetadata.xml @@ -1,7 +1,7 @@ 正體中文 - 5.2.6 + 5.3.0 2025-03 正體中文 Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/libraries/src/Document/Renderer/Html/MetasRenderer.php b/libraries/src/Document/Renderer/Html/MetasRenderer.php index 26b0b082e8595..f6e29d269ad32 100644 --- a/libraries/src/Document/Renderer/Html/MetasRenderer.php +++ b/libraries/src/Document/Renderer/Html/MetasRenderer.php @@ -76,7 +76,7 @@ public function render($head, $params = [], $content = null) throw new \RuntimeException('Detected an override for "joomla.script.options" asset'); } - $jsonFlags = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | (JDEBUG ? JSON_PRETTY_PRINT : 0); + $jsonFlags = JSON_UNESCAPED_UNICODE | (JDEBUG ? JSON_PRETTY_PRINT : 0); $jsonOptions = json_encode($scriptOptions, $jsonFlags); // Set content and update attributes of dummy asset to correct ones diff --git a/libraries/src/Table/Table.php b/libraries/src/Table/Table.php index aed6f5ebc2a62..8c3fb5e9a9396 100644 --- a/libraries/src/Table/Table.php +++ b/libraries/src/Table/Table.php @@ -16,8 +16,11 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\Object\LegacyErrorHandlingTrait; use Joomla\CMS\Object\LegacyPropertyManagementTrait; +use Joomla\Database\DatabaseAwareInterface; +use Joomla\Database\DatabaseAwareTrait; use Joomla\Database\DatabaseInterface; use Joomla\Database\DatabaseQuery; +use Joomla\Database\Exception\DatabaseNotFoundException; use Joomla\Event\DispatcherAwareInterface; use Joomla\Event\DispatcherAwareTrait; use Joomla\Event\DispatcherInterface; @@ -35,9 +38,10 @@ * * @since 1.7.0 */ -abstract class Table extends \stdClass implements TableInterface, DispatcherAwareInterface +abstract class Table extends \stdClass implements TableInterface, DispatcherAwareInterface, DatabaseAwareInterface { use DispatcherAwareTrait; + use DatabaseAwareTrait; use LegacyErrorHandlingTrait; use LegacyPropertyManagementTrait; @@ -87,6 +91,10 @@ abstract class Table extends \stdClass implements TableInterface, DispatcherAwar * * @var DatabaseInterface * @since 1.7.0 + * + * @deprecated __DEPLOY_VERSION__ will be removed in 7.0 + * Use setDatabase() and getDatabase() instead + * Example: $this->setDatabase($db); */ protected $_db; @@ -161,7 +169,7 @@ abstract class Table extends \stdClass implements TableInterface, DispatcherAwar * * @param string $table Name of the table to model. * @param mixed $key Name of the primary key field in the table or array of field names that compose the primary key. - * @param DatabaseInterface $db DatabaseInterface object. + * @param DatabaseInterface $db Object which implements the DatabaseInterface. * @param ?DispatcherInterface $dispatcher Event dispatcher for this table * * @since 1.7.0 @@ -189,7 +197,7 @@ public function __construct($table, $key, DatabaseInterface $db, ?DispatcherInte // Set the singular table key for backwards compatibility. $this->_tbl_key = $this->getKeyName(); - $this->_db = $db; + $this->setDatabase($db); // Initialise the table properties. $fields = $this->getFields(); @@ -242,12 +250,13 @@ public function __construct($table, $key, DatabaseInterface $db, ?DispatcherInte */ public function getFields($reload = false) { - $key = $this->_db->getServerType() . ':' . $this->_db->getName() . ':' . $this->_tbl; + $db = $this->getDatabase(); + $key = $db->getServerType() . ':' . $db->getName() . ':' . $this->_tbl; if (!isset(self::$tableFields[$key]) || $reload) { // Lookup the fields for this table only once. $name = $this->_tbl; - $fields = $this->_db->getTableColumns($name, false); + $fields = $db->getTableColumns($name, false); if (empty($fields)) { throw new \UnexpectedValueException(\sprintf('No columns found for %s table', $name)); @@ -434,7 +443,7 @@ protected function _getAssetTitle() protected function _getAssetParentId(?Table $table = null, $id = null) { // For simple cases, parent to the asset root. - $assets = new Asset($this->getDbo(), $this->getDispatcher()); + $assets = new Asset($this->getDatabase(), $this->getDispatcher()); $rootId = $assets->getRootId(); if (!empty($rootId)) { @@ -456,9 +465,11 @@ protected function _getAssetParentId(?Table $table = null, $id = null) */ public function appendPrimaryKeys($query, $pk = null) { + $db = $this->getDatabase(); + if (\is_null($pk)) { foreach ($this->_tbl_keys as $k) { - $query->where($this->_db->quoteName($k) . ' = ' . $this->_db->quote($this->$k)); + $query->where($db->quoteName($k) . ' = ' . $db->quote($this->$k)); } } else { if (\is_string($pk)) { @@ -468,7 +479,7 @@ public function appendPrimaryKeys($query, $pk = null) $pk = (object) $pk; foreach ($this->_tbl_keys as $k) { - $query->where($this->_db->quoteName($k) . ' = ' . $this->_db->quote($pk->$k)); + $query->where($db->quoteName($k) . ' = ' . $db->quote($pk->$k)); } } } @@ -530,6 +541,10 @@ public function getId() * @return DatabaseInterface The internal database driver object. * * @since 1.7.0 + * + * @deprecated __DEPLOY_VERSION__ will be removed in 7.0 + * Use getDatabase() instead + * Example: $this->getDatabase(); */ public function getDbo() { @@ -544,6 +559,10 @@ public function getDbo() * @return boolean True on success. * * @since 1.7.0 + * + * @deprecated __DEPLOY_VERSION__ will be removed in 7.0 + * Use setDatabase() instead + * Example: $this->setDatabase($db); */ public function setDbo(DatabaseInterface $db) { @@ -552,6 +571,38 @@ public function setDbo(DatabaseInterface $db) return true; } + /** + * Get the database. + * + * @return DatabaseInterface + * + * @since __DEPLOY_VERSION__ + * @throws DatabaseNotFoundException May be thrown if the database has not been set. + * + * @note This method will be removed in 7.0 and DatabaseAwareTrait will be used instead. + */ + protected function getDatabase(): DatabaseInterface + { + return $this->getDbo(); + } + + /** + * Set the database. + * + * @param DatabaseInterface $db The database. + * + * @return void + * + * @since __DEPLOY_VERSION__ + * + * @note This method will be removed in 7.0 and DatabaseAwareTrait will be used instead. + */ + public function setDatabase(DatabaseInterface $db): void + { + $this->_db = $db; + $this->databaseAwareTraitDatabase = $db; + } + /** * Method to set rules for the record. * @@ -715,6 +766,8 @@ public function bind($src, $ignore = []) */ public function load($keys = null, $reset = true) { + $db = $this->getDatabase(); + // Pre-processing by observers $event = AbstractEvent::create( 'onTableBeforeLoad', @@ -760,9 +813,9 @@ public function load($keys = null, $reset = true) } // Initialise the query. - $query = $this->_db->getQuery(true) + $query = $db->getQuery(true) ->select('*') - ->from($this->_db->quoteName($this->_tbl)); + ->from($db->quoteName($this->_tbl)); $fields = array_keys($this->getProperties()); foreach ($keys as $field => $value) { @@ -772,12 +825,12 @@ public function load($keys = null, $reset = true) } // Add the search tuple to the query. - $query->where($this->_db->quoteName($field) . ' = ' . $this->_db->quote($value)); + $query->where($db->quoteName($field) . ' = ' . $db->quote($value)); } - $this->_db->setQuery($query); + $db->setQuery($query); - $row = $this->_db->loadAssoc(); + $row = $db->loadAssoc(); // Check that we have a result. if (empty($row)) { @@ -838,6 +891,7 @@ public function check() */ public function store($updateNulls = false) { + $db = $this->getDatabase(); $result = true; $k = $this->_tbl_keys; @@ -871,9 +925,9 @@ public function store($updateNulls = false) try { // If a primary key exists update the object, otherwise insert it. if ($this->hasPrimaryKey()) { - $this->_db->updateObject($this->_tbl, $this, $this->_tbl_keys, $updateNulls); + $db->updateObject($this->_tbl, $this, $this->_tbl_keys, $updateNulls); } else { - $this->_db->insertObject($this->_tbl, $this, $this->_tbl_keys[0]); + $db->insertObject($this->_tbl, $this, $this->_tbl_keys[0]); } } catch (\Exception $e) { $this->setError($e->getMessage()); @@ -894,7 +948,7 @@ public function store($updateNulls = false) $parentId = $this->_getAssetParentId(); $name = $this->_getAssetName(); $title = $this->_getAssetTitle(); - $asset = new Asset($this->getDbo(), $this->getDispatcher()); + $asset = new Asset($this->getDatabase(), $this->getDispatcher()); $asset->loadByName($name); @@ -937,11 +991,11 @@ public function store($updateNulls = false) // Update the asset_id field in this table. $this->asset_id = (int) $asset->id; - $query = $this->_db->getQuery(true) - ->update($this->_db->quoteName($this->_tbl)) + $query = $db->getQuery(true) + ->update($db->quoteName($this->_tbl)) ->set('asset_id = ' . (int) $this->asset_id); $this->appendPrimaryKeys($query); - $this->_db->setQuery($query)->execute(); + $db->setQuery($query)->execute(); } } @@ -975,6 +1029,8 @@ public function store($updateNulls = false) */ public function save($src, $orderingFilter = '', $ignore = '') { + $db = $this->getDatabase(); + // Attempt to bind the source to the instance. if (!$this->bind($src, $ignore)) { return false; @@ -998,7 +1054,7 @@ public function save($src, $orderingFilter = '', $ignore = '') // If an ordering filter is set, attempt reorder the rows in the table based on the filter and value. if ($orderingFilter) { $filterValue = $this->$orderingFilter; - $this->reorder($orderingFilter ? $this->_db->quoteName($orderingFilter) . ' = ' . $this->_db->quote($filterValue) : ''); + $this->reorder($orderingFilter ? $db->quoteName($orderingFilter) . ' = ' . $db->quote($filterValue) : ''); } // Set the error to empty and return true. @@ -1019,6 +1075,8 @@ public function save($src, $orderingFilter = '', $ignore = '') */ public function delete($pk = null) { + $db = $this->getDatabase(); + if (\is_null($pk)) { $pk = []; @@ -1053,7 +1111,7 @@ public function delete($pk = null) if ($this->_trackAssets) { // Get the asset name $name = $this->_getAssetName(); - $asset = new Asset($this->getDbo(), $this->getDispatcher()); + $asset = new Asset($this->getDatabase(), $this->getDispatcher()); if ($asset->loadByName($name)) { if (!$asset->delete()) { @@ -1065,14 +1123,14 @@ public function delete($pk = null) } // Delete the row by primary key. - $query = $this->_db->getQuery(true) - ->delete($this->_db->quoteName($this->_tbl)); + $query = $db->getQuery(true) + ->delete($db->quoteName($this->_tbl)); $this->appendPrimaryKeys($query, $pk); - $this->_db->setQuery($query); + $db->setQuery($query); // Check for a database error. - $this->_db->execute(); + $db->execute(); // Post-processing by observers $event = AbstractEvent::create( @@ -1104,6 +1162,8 @@ public function delete($pk = null) */ public function checkOut($userId, $pk = null) { + $db = $this->getDatabase(); + // Pre-processing by observers $event = AbstractEvent::create( 'onTableBeforeCheckout', @@ -1146,13 +1206,13 @@ public function checkOut($userId, $pk = null) $time = Factory::getDate()->toSql(); // Check the row out by primary key. - $query = $this->_db->getQuery(true) - ->update($this->_db->quoteName($this->_tbl)) - ->set($this->_db->quoteName($checkedOutField) . ' = ' . (int) $userId) - ->set($this->_db->quoteName($checkedOutTimeField) . ' = ' . $this->_db->quote($time)); + $query = $db->getQuery(true) + ->update($db->quoteName($this->_tbl)) + ->set($db->quoteName($checkedOutField) . ' = ' . (int) $userId) + ->set($db->quoteName($checkedOutTimeField) . ' = ' . $db->quote($time)); $this->appendPrimaryKeys($query, $pk); - $this->_db->setQuery($query); - $this->_db->execute(); + $db->setQuery($query); + $db->execute(); // Set table values in the object. $this->$checkedOutField = (int) $userId; @@ -1186,6 +1246,8 @@ public function checkOut($userId, $pk = null) */ public function checkIn($pk = null) { + $db = $this->getDatabase(); + // Pre-processing by observers $event = AbstractEvent::create( 'onTableBeforeCheckin', @@ -1223,19 +1285,19 @@ public function checkIn($pk = null) $checkedOutField = $this->getColumnAlias('checked_out'); $checkedOutTimeField = $this->getColumnAlias('checked_out_time'); - $nullDate = $this->_supportNullValue ? 'NULL' : $this->_db->quote($this->_db->getNullDate()); + $nullDate = $this->_supportNullValue ? 'NULL' : $db->quote($db->getNullDate()); $nullID = $this->_supportNullValue ? 'NULL' : '0'; // Check the row in by primary key. - $query = $this->_db->getQuery(true) - ->update($this->_db->quoteName($this->_tbl)) - ->set($this->_db->quoteName($checkedOutField) . ' = ' . $nullID) - ->set($this->_db->quoteName($checkedOutTimeField) . ' = ' . $nullDate); + $query = $db->getQuery(true) + ->update($db->quoteName($this->_tbl)) + ->set($db->quoteName($checkedOutField) . ' = ' . $nullID) + ->set($db->quoteName($checkedOutTimeField) . ' = ' . $nullDate); $this->appendPrimaryKeys($query, $pk); - $this->_db->setQuery($query); + $db->setQuery($query); // Check for a database error. - $this->_db->execute(); + $db->execute(); // Set table values in the object. $this->$checkedOutField = $this->_supportNullValue ? null : 0; @@ -1266,6 +1328,8 @@ public function checkIn($pk = null) */ public function hasPrimaryKey() { + $db = $this->getDatabase(); + if ($this->_autoincrement) { $empty = true; @@ -1273,13 +1337,13 @@ public function hasPrimaryKey() $empty = $empty && empty($this->$key); } } else { - $query = $this->_db->getQuery(true) + $query = $db->getQuery(true) ->select('COUNT(*)') - ->from($this->_db->quoteName($this->_tbl)); + ->from($db->quoteName($this->_tbl)); $this->appendPrimaryKeys($query); - $this->_db->setQuery($query); - $count = $this->_db->loadResult(); + $db->setQuery($query); + $count = $db->loadResult(); if ($count == 1) { $empty = false; @@ -1303,6 +1367,8 @@ public function hasPrimaryKey() */ public function hit($pk = null) { + $db = $this->getDatabase(); + // Pre-processing by observers $event = AbstractEvent::create( 'onTableBeforeHit', @@ -1340,12 +1406,12 @@ public function hit($pk = null) $hitsField = $this->getColumnAlias('hits'); // Check the row in by primary key. - $query = $this->_db->getQuery(true) - ->update($this->_db->quoteName($this->_tbl)) - ->set($this->_db->quoteName($hitsField) . ' = (' . $this->_db->quoteName($hitsField) . ' + 1)'); + $query = $db->getQuery(true) + ->update($db->quoteName($this->_tbl)) + ->set($db->quoteName($hitsField) . ' = (' . $db->quoteName($hitsField) . ' + 1)'); $this->appendPrimaryKeys($query, $pk); - $this->_db->setQuery($query); - $this->_db->execute(); + $db->setQuery($query); + $db->execute(); // Set table values in the object. $this->hits++; @@ -1420,22 +1486,24 @@ public function isCheckedOut($with = 0, $against = null) */ public function getNextOrder($where = '') { + $db = $this->getDatabase(); + // Check if there is an ordering field set if (!$this->hasField('ordering')) { throw new \UnexpectedValueException(\sprintf('%s does not support ordering.', \get_class($this))); } // Get the largest ordering value for a given where clause. - $query = $this->_db->getQuery(true) - ->select('MAX(' . $this->_db->quoteName($this->getColumnAlias('ordering')) . ')') - ->from($this->_db->quoteName($this->_tbl)); + $query = $db->getQuery(true) + ->select('MAX(' . $db->quoteName($this->getColumnAlias('ordering')) . ')') + ->from($db->quoteName($this->_tbl)); if ($where) { $query->where($where); } - $this->_db->setQuery($query); - $max = (int) $this->_db->loadResult(); + $db->setQuery($query); + $max = (int) $db->loadResult(); // Return the largest ordering value + 1. return $max + 1; @@ -1475,27 +1543,29 @@ public function getPrimaryKey(array $keys = []) */ public function reorder($where = '') { + $db = $this->getDatabase(); + // Check if there is an ordering field set if (!$this->hasField('ordering')) { throw new \UnexpectedValueException(\sprintf('%s does not support ordering.', \get_class($this))); } - $quotedOrderingField = $this->_db->quoteName($this->getColumnAlias('ordering')); + $quotedOrderingField = $db->quoteName($this->getColumnAlias('ordering')); - $subquery = $this->_db->getQuery(true) - ->from($this->_db->quoteName($this->_tbl)) + $subquery = $db->getQuery(true) + ->from($db->quoteName($this->_tbl)) ->selectRowNumber($quotedOrderingField, 'new_ordering'); - $query = $this->_db->getQuery(true) - ->update($this->_db->quoteName($this->_tbl)) + $query = $db->getQuery(true) + ->update($db->quoteName($this->_tbl)) ->set($quotedOrderingField . ' = sq.new_ordering'); $innerOn = []; // Get the primary keys for the selection. foreach ($this->_tbl_keys as $i => $k) { - $subquery->select($this->_db->quoteName($k, 'pk__' . $i)); - $innerOn[] = $this->_db->quoteName($k) . ' = sq.' . $this->_db->quoteName('pk__' . $i); + $subquery->select($db->quoteName($k, 'pk__' . $i)); + $innerOn[] = $db->quoteName($k) . ' = sq.' . $db->quoteName('pk__' . $i); } // Setup the extra where and ordering clause data. @@ -1523,8 +1593,8 @@ public function reorder($where = '') ); $this->getDispatcher()->dispatch('onTableBeforeReorder', $event); - $this->_db->setQuery($query); - $this->_db->execute(); + $db->setQuery($query); + $db->execute(); // Post-processing by observers $event = AbstractEvent::create( @@ -1554,13 +1624,15 @@ public function reorder($where = '') */ public function move($delta, $where = '') { + $db = $this->getDatabase(); + // Check if there is an ordering field set if (!$this->hasField('ordering')) { throw new \UnexpectedValueException(\sprintf('%s does not support ordering.', \get_class($this))); } $orderingField = $this->getColumnAlias('ordering'); - $quotedOrderingField = $this->_db->quoteName($orderingField); + $quotedOrderingField = $db->quoteName($orderingField); // If the change is none, do nothing. if (empty($delta)) { @@ -1568,11 +1640,11 @@ public function move($delta, $where = '') } $row = null; - $query = $this->_db->getQuery(true); + $query = $db->getQuery(true); // Select the primary key and ordering values from the table. $query->select(implode(',', $this->_tbl_keys) . ', ' . $quotedOrderingField) - ->from($this->_db->quoteName($this->_tbl)); + ->from($db->quoteName($this->_tbl)); // If the movement delta is negative move the row up. if ($delta < 0) { @@ -1603,37 +1675,37 @@ public function move($delta, $where = '') // Select the first row with the criteria. $query->setLimit(1); - $this->_db->setQuery($query); - $row = $this->_db->loadObject(); + $db->setQuery($query); + $row = $db->loadObject(); // If a row is found, move the item. if (!empty($row)) { // Update the ordering field for this instance to the row's ordering value. $query->clear() - ->update($this->_db->quoteName($this->_tbl)) + ->update($db->quoteName($this->_tbl)) ->set($quotedOrderingField . ' = ' . (int) $row->$orderingField); $this->appendPrimaryKeys($query); - $this->_db->setQuery($query); - $this->_db->execute(); + $db->setQuery($query); + $db->execute(); // Update the ordering field for the row to this instance's ordering value. $query->clear() - ->update($this->_db->quoteName($this->_tbl)) + ->update($db->quoteName($this->_tbl)) ->set($quotedOrderingField . ' = ' . (int) $this->$orderingField); $this->appendPrimaryKeys($query, $row); - $this->_db->setQuery($query); - $this->_db->execute(); + $db->setQuery($query); + $db->execute(); // Update the instance value. $this->$orderingField = $row->$orderingField; } else { // Update the ordering field for this instance. $query->clear() - ->update($this->_db->quoteName($this->_tbl)) + ->update($db->quoteName($this->_tbl)) ->set($quotedOrderingField . ' = ' . (int) $this->$orderingField); $this->appendPrimaryKeys($query); - $this->_db->setQuery($query); - $this->_db->execute(); + $db->setQuery($query); + $db->execute(); } // Post-processing by observers @@ -1666,6 +1738,8 @@ public function move($delta, $where = '') */ public function publish($pks = null, $state = 1, $userId = 0) { + $db = $this->getDatabase(); + // Sanitize input $userId = (int) $userId; $state = (int) $state; @@ -1717,23 +1791,23 @@ public function publish($pks = null, $state = 1, $userId = 0) foreach ($pks as $pk) { // Update the publishing state for rows with the given primary keys. - $query = $this->_db->getQuery(true) - ->update($this->_db->quoteName($this->_tbl)) - ->set($this->_db->quoteName($publishedField) . ' = ' . (int) $state); + $query = $db->getQuery(true) + ->update($db->quoteName($this->_tbl)) + ->set($db->quoteName($publishedField) . ' = ' . (int) $state); // If publishing, set published date/time if not previously set if ($state && $this->hasField('publish_up') && (int) $this->publish_up == 0) { - $nowDate = $this->_db->quote(Factory::getDate()->toSql()); - $query->set($this->_db->quoteName($this->getColumnAlias('publish_up')) . ' = ' . $nowDate); + $nowDate = $db->quote(Factory::getDate()->toSql()); + $query->set($db->quoteName($this->getColumnAlias('publish_up')) . ' = ' . $nowDate); } // Determine if there is checkin support for the table. if ($this->hasField('checked_out') || $this->hasField('checked_out_time')) { $query->where( '(' - . $this->_db->quoteName($checkedOutField) . ' = 0' - . ' OR ' . $this->_db->quoteName($checkedOutField) . ' = ' . (int) $userId - . ' OR ' . $this->_db->quoteName($checkedOutField) . ' IS NULL' + . $db->quoteName($checkedOutField) . ' = 0' + . ' OR ' . $db->quoteName($checkedOutField) . ' = ' . (int) $userId + . ' OR ' . $db->quoteName($checkedOutField) . ' IS NULL' . ')' ); $checkin = true; @@ -1744,10 +1818,10 @@ public function publish($pks = null, $state = 1, $userId = 0) // Build the WHERE clause for the primary keys. $this->appendPrimaryKeys($query, $pk); - $this->_db->setQuery($query); + $db->setQuery($query); try { - $this->_db->execute(); + $db->execute(); } catch (\RuntimeException $e) { $this->setError($e->getMessage()); @@ -1755,7 +1829,7 @@ public function publish($pks = null, $state = 1, $userId = 0) } // If checkin is supported and all rows were adjusted, check them in. - if ($checkin && (\count($pks) == $this->_db->getAffectedRows())) { + if ($checkin && (\count($pks) == $db->getAffectedRows())) { $this->checkIn($pk); } @@ -1800,7 +1874,7 @@ public function publish($pks = null, $state = 1, $userId = 0) */ protected function _lock() { - $this->_db->lockTable($this->_tbl); + $this->getDatabase()->lockTable($this->_tbl); $this->_locked = true; return true; @@ -1858,7 +1932,7 @@ public function setColumnAlias($column, $columnAlias) protected function _unlock() { if ($this->_locked) { - $this->_db->unlockTables(); + $this->getDatabase()->unlockTables(); $this->_locked = false; } diff --git a/package-lock.json b/package-lock.json index dd78e0325e1c9..cce256419d4ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7533,9 +7533,9 @@ "license": "MIT" }, "node_modules/joomla-cypress": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/joomla-cypress/-/joomla-cypress-1.3.0.tgz", - "integrity": "sha512-pBSmhop4IJhZma0noYfuq3KtKOl9qivDk6eSva6GcDq2Anyog1qj1L/4jXS9P2hYg6SXDdyw05mcr1a8IjATpA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/joomla-cypress/-/joomla-cypress-1.3.1.tgz", + "integrity": "sha512-8ww37fHL2yVTld8f7BwZuIFc5g1Ba0bCgaxlMGZhqBl89BO+iGaiAXR9uKT5pufjaZEJDBVd92ScTJZLaoeRwQ==", "dev": true, "license": "GPL-2.0+", "dependencies": { diff --git a/templates/system/build_incomplete.html b/templates/system/build_incomplete.html index 50014b0c6506e..9eb53c2561d52 100644 --- a/templates/system/build_incomplete.html +++ b/templates/system/build_incomplete.html @@ -6,7 +6,7 @@ Joomla: Environment Setup Incomplete - +
diff --git a/templates/system/fatal-error.html b/templates/system/fatal-error.html index 75c9faff1a50d..68247714020c9 100644 --- a/templates/system/fatal-error.html +++ b/templates/system/fatal-error.html @@ -6,7 +6,7 @@ An Error Occurred: {{statusText}} - +
diff --git a/templates/system/incompatible.html b/templates/system/incompatible.html index 4593b6d29f35f..513d0941d61e5 100644 --- a/templates/system/incompatible.html +++ b/templates/system/incompatible.html @@ -6,7 +6,7 @@ Joomla: unsupported PHP version - +
diff --git a/tests/System/integration/administrator/components/com_contenthistory/Content.cy.js b/tests/System/integration/administrator/components/com_contenthistory/Content.cy.js index afa40f90dab93..d2a7729a2aeef 100644 --- a/tests/System/integration/administrator/components/com_contenthistory/Content.cy.js +++ b/tests/System/integration/administrator/components/com_contenthistory/Content.cy.js @@ -94,7 +94,7 @@ describe('Test in backend that the content history list', () => { .should('contain.text', 'Please select two versions'); }); - it('can delete an history content item', () => { + it('can delete a history content item', () => { cy.visit('/administrator/index.php?option=com_content&task=article.add'); cy.get('#jform_title').clear().type('Test article versions'); cy.clickToolbarButton('Save');