Skip to content

Commit 04d4276

Browse files
authored
[5.3] Upmerge changes from 5.2-dev 2024-11-19
2 parents 419d986 + 1fb73b2 commit 04d4276

File tree

8 files changed

+22
-18
lines changed

8 files changed

+22
-18
lines changed

administrator/components/com_admin/script.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3546,13 +3546,15 @@ protected function fixFilesystemPermissions()
35463546
}
35473547

35483548
foreach ($folders as $folder) {
3549-
if (is_dir(JPATH_ROOT . $folder) && decoct(fileperms(JPATH_ROOT . $folder) & 0777) === '777') {
3550-
@chmod(JPATH_ROOT . $folder, 0755);
3551-
}
3549+
if (is_dir(JPATH_ROOT . $folder)) {
3550+
if (decoct(fileperms(JPATH_ROOT . $folder) & 0777) === '777') {
3551+
@chmod(JPATH_ROOT . $folder, 0755);
3552+
}
35523553

3553-
foreach (Folder::files(JPATH_ROOT . $folder, '.', false, true) as $file) {
3554-
if (decoct(fileperms($file) & 0777) === '777') {
3555-
@chmod($file, 0644);
3554+
foreach (Folder::files(JPATH_ROOT . $folder, '.', false, true) as $file) {
3555+
if (decoct(fileperms($file) & 0777) === '777') {
3556+
@chmod($file, 0644);
3557+
}
35563558
}
35573559
}
35583560
}

includes/incompatible.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

installation/language/hr-HR/joomla.ini

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
; Fatal error page
77
; These will be processed by the JavaScript Build
88
BUILD_FATAL_HEADER="Nažalost, došlo je do problema koji nismo u mogućnosti oporaviti."
9-
BUILD_FATAL_LANGUAGE="Hrvatski" ; 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
9+
BUILD_FATAL_LANGUAGE="Hrvatski HR" ; 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
1010
BUILD_FATAL_TEXT="Server je vratio \"{{statusCode_statusText}}\""
1111
BUILD_FATAL_URL_TEXT="Pomozite mi riješiti ovo"
1212
; These will be processed by the JavaScript Build
1313
BUILD_INCOMPLETE_HEADER="Nepotpuna postavka okoline"
14-
BUILD_INCOMPLETE_LANGUAGE="Hrvatski" ; 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
14+
BUILD_INCOMPLETE_LANGUAGE="Hrvatski HR" ; 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
1515
BUILD_INCOMPLETE_TEXT="Čini se da pokušavate pokrenuti Joomla! iz našeg git reprozitorija. Da biste to učinili, morate prvo dovršiti nekoliko dodatnih koraka."
1616
BUILD_INCOMPLETE_URL_TEXT="Više detalja"
1717
; These will be processed by the JavaScript Build
1818
BUILD_NOXML_HEADER="Vašem PHP-u nedostaje važna biblioteka"
19-
BUILD_NOXML_LANGUAGE="Hrvatski" ; 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
19+
BUILD_NOXML_LANGUAGE="Hrvatski HR" ; 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
2020
BUILD_NOXML_TEXT="Za pokretanje ove Joomla! verzije, vaš host treba koristiti PHP s podrškom za XML biblioteku."
2121
BUILD_NOXML_URL_TEXT="Pomozite mi riješiti ovo"
2222
; These will be processed by the JavaScript Build
2323
BUILD_MIN_PHP_ERROR_HEADER="Nažalost, vaša PHP verzija nije podržana."
24-
BUILD_MIN_PHP_ERROR_LANGUAGE="Hrvatski" ; 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
24+
BUILD_MIN_PHP_ERROR_LANGUAGE="Hrvatski HR" ; 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
2525
BUILD_MIN_PHP_ERROR_TEXT="Za pokretanje ove Joomla verzije, vaš host treba koristiti PHP verziju {{phpversion}} ili noviju."
2626
BUILD_MIN_PHP_ERROR_URL_TEXT="Pomozite mi riješiti ovo"
2727
; Main Config
@@ -81,11 +81,13 @@ INSTL_DATABASE_NAME_LABEL="Ime Baze podataka"
8181
INSTL_DATABASE_NAME_MSG_MYSQL="Naziv baze podataka nije važeći. Ne smije sadržavati sljedeće znakove: \ /"
8282
INSTL_DATABASE_NAME_MSG_POSTGRES="Ime baze podataka nije važeće. Mora počinjati slovom i nastaviti se alfanumeričkim znakovima."
8383
INSTL_DATABASE_NO_SCHEMA="Ne postoji shema baze podataka za ovaj tip baze podataka."
84+
INSTL_DATABASE_PASSWORD_DESC="Upiši lozinku baze podataka koju si kreirao ili lozinku koju si dobio od svog od svog hostera."
8485
INSTL_DATABASE_PREFIX_DESC="Upišite prefiks tablice ili koristite nasumično generirani."
8586
INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Ako koristite postojeću bazu podataka sa tablicama koje imaju iste prefikse, Joomla će preimenovati postojeće tablice dodajući prefix \"bak_\"."
8687
INSTL_DATABASE_PREFIX_MSG="Prefiks baze podataka mora započinjati sa slovom, kojeg sljede proizvoljni alfanumerički znakovi, a završavati donjom crtom"
8788
INSTL_DATABASE_RESPONSE_ERROR="Proces instalacije nije uspio."
8889
INSTL_DATABASE_TYPE_DESC="Odaberite tip baze podataka."
90+
INSTL_DATABASE_USER_DESC="Unesite korisničko ime baze podataka koje si kreirao ili korisničko ime koje si dobio od svog hostera."
8991
INSTL_DATABASE_VALIDATION_ERROR="Provjerite vjerodajnice za svoju bazu podataka, vrstu baze podataka, naziv baze podataka ili naziv hosta. Ako imate instaliran MySQL 8, onda pročitajte <a href=\"https://docs.joomla.org/Special:MyLanguage/Joomla_and_MySQL_8#Workaround_to_get_Joomla_working_with_MySQL_8\" target=\"_blank\" rel=\"noopener noreferrer\">wiki</a> za više informacija."
9092

9193
INSTL_CONNECT_DB="Postavke spajanje na bazu podataka"

installation/language/hr-HR/langmetadata.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="installation">
3-
<name>Croatian (Croatia)</name>
3+
<name>Hrvatski (Hrvatska)</name>
44
<version>5.2.2</version>
55
<creationDate>2024-11</creationDate>
66
<author>Joomla! Hrvatska team</author>
@@ -10,8 +10,8 @@
1010
<filename>joomla.ini</filename>
1111
</files>
1212
<metadata>
13-
<name>Croatian (Croatia)</name>
14-
<nativeName>Croatian (Croatia)</nativeName>
13+
<name>Croatian (hr-HR)</name>
14+
<nativeName>Hrvatski (Hrvatska)</nativeName>
1515
<tag>hr-HR</tag>
1616
<rtl>0</rtl>
1717
</metadata>

installation/language/ta-IN/joomla.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="%s மொழிக்
246246
JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP-இன் allow_url_fopen அமைப்பு முடக்கப்பட்டுள்ளது. புதுப்பி (updater) வேலை செய்வதற்கு இந்த அமைப்பானது கட்டாயம் இயலுமைப்படுத்தப்பட வேண்டும்."
247247
JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="புதுப்பித்தல்: :Collection: %s-ஐத் திறக்க முடியவில்லை."
248248
JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="புதுப்பித்தல்: :Collection: %s-ஐ அலகிட (parse) முடியவில்லை."
249-
JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="புதுப்பித்தல்: புதுப்பித்தல் தளத்தைத் திறக்க முடியவில்லை #%d &quot;%s&quot;, இணையமுகவரி: %s"
249+
JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="புதுப்பித்தல்: புதுப்பிக்கும் தளத்தைத் திறக்க முடியவில்லை #%d &quot;%s&quot;, இணையமுகவரி: %s"
250250
JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: தரவுத்தளத்துடன் தொடர்பு கொள்ள முடியவில்லை<br>joomla.library: %1$s - %2$s"
251251
; Strings for the language debugger
252252
JDEBUG_LANGUAGE_FILES_IN_ERROR="மொழிக் கோப்புகளில் அலகிடல்/சொல்லிலக்கணப் பிழைகள்"

templates/system/build_incomplete.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

templates/system/fatal-error.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

templates/system/incompatible.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)