Merge branch 'flatpressblog:master' into Akismet-out,-DateChanger-in

2024-02-04 04:10:07 +01:00 · 2024-02-04 04:10:07 +01:00 · cad356b921
commit cad356b921
parent 61c78261dd 6befa1e641
16 changed files with 53 additions and 30 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -93,7 +93,7 @@
 - Contact form: Admin notification mail is now localized ([#205](https://github.com/flatpressblog/flatpress/issues/205))
 - Setup tries to determine local language automatically ([#197](https://github.com/flatpressblog/flatpress/issues/197), [#216](https://github.com/flatpressblog/flatpress/issues/216), [#262](https://github.com/flatpressblog/flatpress/issues/262))
 - The HTML of the installer now has a lang attribute in the html start tag to specify the language.
- BBcode toolbar: Internationalized button titles translated to the end
+- BBCode plugin: Localized toolbar button tooltips

 ## Bugfixes
 - Plugin management page: Removed empty warning messages box
--- a/admin/panels/maintain/admin.maintain.php
+++ b/admin/panels/maintain/admin.maintain.php
@ -159,7 +159,17 @@ class admin_maintain_default extends AdminPanelAction {
 			case 'restorechmods':
 				{
 					$this->smarty->assign('files', fs_chmod_recursive());
+
+					// Test whether writing is possible in the fp-content directory
+					$test_file = @fopen(CONTENT_DIR . 'chmod-test-file', "a+");
+					if ($test_file) {
 						$this->smarty->assign('success', 1);
+					} else {
+						$this->smarty->assign('success', -1);
+					}
+					@fclose($test_file);
+					@unlink(CONTENT_DIR . 'chmod-test-file');
+
 					return PANEL_NOREDIRECT;
 				}
 			case 'purgetplcache':
--- a/fp-interface/lang/cs-cz/lang.admin.maintain.php
+++ b/fp-interface/lang/cs-cz/lang.admin.maintain.php
@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array(
 	'opt4' => 'Ukázat informace o PHP',
 	'opt5' => 'Zjistit aktualizace',

-	'chmod_info' => 'Následující oprávnění <strong>nemůžou být</strong> resetované na 0776; pravděpodobně vlastník souborů není stejná osoba jako vlastník webu. ' . //
+	'chmod_info' => 'Pokud se oprávnění souboru <strong>nepodařilo</strong> obnovit na ' . decoct(FILE_PERMISSIONS) . ', vlastník souboru pravděpodobně není stejný jako vlastník webového serveru.<br>' . //
 		'Případně můžete ignorovat toto oznámení.'
 );

 $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array(
-	1 => 'Operace kompletní'
+	1 => 'Operace kompletní',
+	-1 => 'Operace se nezdařila'
 );

 $lang ['admin'] ['maintain'] ['updates'] = array(
--- a/fp-interface/lang/da-dk/lang.admin.maintain.php
+++ b/fp-interface/lang/da-dk/lang.admin.maintain.php
@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array(
 	'opt4' => 'Vis PHP-information om webserveren',
 	'opt5' => 'Tjek for nye versioner',

-	'chmod_info' => 'Filadgangsrettighederne <strong>kunne ikke være nulstilles til standardværdierne på 0776.' . //
+	'chmod_info' => 'Hvis filrettighederne <strong>ikke</strong> kunne nulstilles til ' . decoct(FILE_PERMISSIONS) . ', er ejeren af filen sandsynligvis ikke den samme som ejeren af webserveren.<br>' . //
 		'Normalt kan du ignorere dette tip.'
 );

 $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array(
-	1 => 'Handling udført.'
+	1 => 'Handling udført.',
+	-1 => 'Handling mislukt.'
 );

 $lang ['admin'] ['maintain'] ['updates'] = array(
--- a/fp-interface/lang/de-de/lang.admin.maintain.php
+++ b/fp-interface/lang/de-de/lang.admin.maintain.php
@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array(
 	'opt4' => 'Zeige PHP-Informationen des Webservers',
 	'opt5' => 'Prüfe auf neue Versionen',

-	'chmod_info' => 'Die Dateizugriffsrechte <strong>konnten nicht</strong> auf die Default Werte von 0776 zurückgesetzt werden. ' . //
+	'chmod_info' => 'Wenn die Dateiberechtigungen <strong>nicht</strong> auf ' . decoct(FILE_PERMISSIONS) . ' zurückgesetzt werden konnten, ist wahrscheinlich der Eigentümer der Datei nicht derselbe wie der des Webservers.<br>' . //
 		'Normalerweise kann man diesen Hinweis ignorieren.'
 );

 $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array(
-	1 => 'Aktion ausgeführt.'
+	1 => 'Aktion ausgeführt.',
+	-1 => 'Aktion fehlgeschlagen.'
 );

 $lang ['admin'] ['maintain'] ['updates'] = array(
--- a/fp-interface/lang/el-gr/lang.admin.maintain.php
+++ b/fp-interface/lang/el-gr/lang.admin.maintain.php
@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array(
 	'opt4' => 'Εμφάνιση πληροφοριών σχετικά με την PHP',
 	'opt5' => 'Έλεγχος για αναβαθμίσεις',

-	'chmod_info' => 'Τα ακόλουθα δικαιώματα αρχείων <strong>δεν μπόρεσαν</strong> να επανέλθουν σε 0776; πιθανότατα ο ιδιοκτήτης των αρχείων δεν είναι ο ίδιος με τον ιδιοκτήτη του διακομιστή. ' . //
+	'chmod_info' => 'Αν τα δικαιώματα του αρχείου <strong>δεν μπόρεσαν</strong> να επανέλθουν σε ' . decoct(FILE_PERMISSIONS) . ', ο ιδιοκτήτης του αρχείου δεν είναι πιθανότατα ο ίδιος με τον ιδιοκτήτη του διακομιστή ιστού.<br>' . //
 		'Συνήθως αυτή η ειδοποίηση μπορεί να αγνοηθεί.'
 );

 $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array(
-	1 => 'Η διαδικασία ολοκληρώθηκε'
+	1 => 'Η διαδικασία ολοκληρώθηκε',
+	-1 => 'Η διαδικασία απέτυχε'
 );

 $lang ['admin'] ['maintain'] ['updates'] = array(
--- a/fp-interface/lang/en-us/lang.admin.maintain.php
+++ b/fp-interface/lang/en-us/lang.admin.maintain.php
@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array(
 	'opt4' => 'Show info about PHP',
 	'opt5' => 'Check for updates',

-	'chmod_info' => 'The following file permissions <strong>could not</strong> be reset to 0776; probably file owner is not the same as the webserver\'s. ' . //
-		'Usually you can ignore this notice.'
+	'chmod_info' => 'If the file permissions <strong>could not</strong> be reset to ' . decoct(FILE_PERMISSIONS) . ', the owner of the file is probably not the same as the owner of the web server.<br>' . //
+		'Normalement, tu peux ignorer cette remarque.'
 );
 	
 $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array(
-	1 => 'Operation completed'
+	1 => 'Operation completed',
+	-1 => 'Operation failed'
 );

 $lang ['admin'] ['maintain'] ['updates'] = array(
--- a/fp-interface/lang/es-es/lang.admin.maintain.php
+++ b/fp-interface/lang/es-es/lang.admin.maintain.php
@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array(
 	'opt4' => 'Mostrar información sobre PHP',
 	'opt5' => 'Buscar actualizaciones',

-	'chmod_info' => 'Los siguientes permisos de archivo <strong>no pudieron</strong> ser reiniciados a 0776; probablemente el propietario del archivo no sea el mismo que el del servidor web. ' . //
+	'chmod_info' => 'Si los permisos del archivo <strong>no se pudieron</strong> restablecer a ' . decoct(FILE_PERMISSIONS) . ', es probable que el propietario del archivo no sea el mismo que el del servidor web.<br>' . //
 		'Por lo general, puede ignorar este aviso.'
 );

 $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array(
-	1 => 'Operación completada'
+	1 => 'Operación completada',
+	-1 => 'Operación fallida'
 );

 $lang ['admin'] ['maintain'] ['updates'] = array(
--- a/fp-interface/lang/fr-fr/lang.admin.maintain.php
+++ b/fp-interface/lang/fr-fr/lang.admin.maintain.php
@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array(
 	'opt4' => 'Afficher info.php',
 	'opt5' => 'V&eacute;rifier les mises &agrave; jour',

-	'chmod_info' => 'Les permissions de fichiers (chmod) <strong>ne sont peut-&ecirc;tre pas</strong> &agrave; 0776; propri&eacute;taire du fichier peut-&ecirc;' . //
+	'chmod_info' => 'Si les permissions du fichier <strong>n\'ont pas pu être remises à ' . decoct(FILE_PERMISSIONS) . '</strong>, il est probable que le propriétaire du fichier ne soit pas le même que celui du serveur web.<br>' . //
 		'tre diff&eacute;rent du serveur web.'
 );

 $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array(
-	1 => 'Op&eacute;ration effectu&eacute;e'
+	1 => 'Op&eacute;ration effectu&eacute;e',
+	-1 => '&Eacute;chec de l\'op&eacute;ration'
 );
 	
 $lang ['admin'] ['maintain'] ['updates'] = array(
--- a/fp-interface/lang/it-it/lang.admin.maintain.php
+++ b/fp-interface/lang/it-it/lang.admin.maintain.php
@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array(
 	'opt4' => 'Visualizza informazioni su PHP',
 	'opt5' => 'Controllo aggiornamenti',

-	'chmod_info' => 'I seguenti permessi dei file <strong>non possono</strong> essere ripristinati a 0776; probabilmente il proprietario non è lo stesso del server web. ' . //
+	'chmod_info' => 'Se non è stato possibile reimpostare i permessi del file a ' . decoct(FILE_PERMISSIONS) . ', probabilmente il proprietario del file non è lo stesso del server web.<br>' . //
 		'Di solito puoi ignorare questo avviso.'
 );

 $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array(
-	1 => 'Operazione completata con successo'
+	1 => 'Operazione completata con successo',
+	-1 => 'Operazione non completata con successo'
 );

 $lang ['admin'] ['maintain'] ['updates'] = array(
--- a/fp-interface/lang/ja-jp/lang.admin.maintain.php
+++ b/fp-interface/lang/ja-jp/lang.admin.maintain.php
@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array(
 	'opt4' => 'PHP情報を表示します',
 	'opt5' => 'アップデートをチェックします',

-	'chmod_info' => '次のファイルのパーミッションを 0776 にリセット<strong>できません</strong>; おそらく、ファイルの所有権者とウェブサーバの権限が異なるのでしょう。' . //
+	'chmod_info' => 'ファイルのパーミッションを' . decoct(FILE_PERMISSIONS) . 'にリセットできなかった場合、ファイルの所有者がウェブサーバーの所有者と同じでない可能性があります。<br>' . //
 		'でも通常、この通知を無視することができます。'
 );

 $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array(
-	1 => '作業を完了しました。'
+	1 => '作業を完了しました。',
+	-1 => '操作が正常に完了しなかった。'
 );

 $lang ['admin'] ['maintain'] ['updates'] = array(
--- a/fp-interface/lang/nl-nl/lang.admin.maintain.php
+++ b/fp-interface/lang/nl-nl/lang.admin.maintain.php
@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array(
 	'opt4' => 'Toon info over PHP',
 	'opt5' => 'Controleren op updates',

-	'chmod_info' => 'De volgende bestandsmachtigingen <strong>kan niet</strong> worden teruggezet naar 0776; waarschijnlijk is de bestandseigenaar niet hetzelfde als de webserver\'s. ' . //
+	'chmod_info' => 'Als de bestandsrechten niet konden worden teruggezet naar ' . decoct(FILE_PERMISSIONS) . ', is de eigenaar van het bestand waarschijnlijk niet dezelfde als de eigenaar van de webserver.<br>' . //
 		'Meestal kunt u deze kennisgeving negeren.'
 );

 $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array(
-	1 => 'Operation completed'
+	1 => 'Operation completed',
+	-1 => 'Operatie mislukt'
 );

 $lang ['admin'] ['maintain'] ['updates'] = array(
--- a/fp-interface/lang/pt-br/lang.admin.maintain.php
+++ b/fp-interface/lang/pt-br/lang.admin.maintain.php
@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array(
 	'opt4' => 'Mostre as informações sobre o PHP',
 	'opt5' => 'Procure atualizações',

-	'chmod_info' => 'As seguintes permissões de arquivo <strong>não puderam</strong> ser redefinidas para 0776; provavelmente o proprietário do arquivo não é o mesmo do servidor da web. ' . //
+	'chmod_info' => 'Se não for possível redefinir as permissões do arquivo para ' . decoct(FILE_PERMISSIONS) . ', o proprietário do arquivo provavelmente não é o mesmo que o proprietário do servidor Web.<br>' . //
 		'Geralmente você pode ignorar este aviso.'
 );

 $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array(
-	1 => 'Operação concluída'
+	1 => 'Operação concluída',
+	-1 => 'Falha na operação'
 );

 $lang ['admin'] ['maintain'] ['updates'] = array(
--- a/fp-interface/lang/ru-ru/lang.admin.maintain.php
+++ b/fp-interface/lang/ru-ru/lang.admin.maintain.php
@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array(
 	'opt4' => 'Показать информацию о PHP',
 	'opt5' => 'Проверить наличие обновлений',

-	'chmod_info' => '<strong>Не удалось<strong> сбросить следующие права доступа к файлам на 0776; вероятно, владелец файла не совпадает с владельцем веб-сервера. ' . //
+	'chmod_info' => 'Если права доступа к файлу не удалось сбросить на ' . decoct(FILE_PERMISSIONS) . ', владелец файла, вероятно, не совпадает с владельцем веб-сервера.<br>' . //
 		'Обычно это уведомление можно проигнорировать.'
 );

 $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array(
-	1 => 'Операция выполнена'
+	1 => 'Операция выполнена',
+	-1 => 'Операция не удалась'
 );

 $lang ['admin'] ['maintain'] ['updates'] = array(
--- a/fp-interface/lang/sl-si/lang.admin.maintain.php
+++ b/fp-interface/lang/sl-si/lang.admin.maintain.php
@ -11,12 +11,13 @@ $lang ['admin'] ['maintain'] ['default'] = array(
 	'opt4' => 'Prikaži informacije o PHP',
 	'opt5' => 'Preveri posodobitve',

-	'chmod_info' => 'Naslednja dovoljenja za datoteke <strong>ni mogoče</strong> povrniti na 0776; verjetno lastnik datoteke ni isti kot spletne strežnik. ' . //
+	'chmod_info' => 'Če pravic datoteke ni bilo mogoče ponastaviti na ' . decoct(FILE_PERMISSIONS) . ', lastnik datoteke verjetno ni isti kot lastnik spletnega strežnika.<br>' . //
 		'Običajno lahko to obvestilo prezrete.'
 );

 $lang ['admin'] ['maintain'] ['default'] ['msgs'] = array(
-	1 => 'Operacija je končana'
+	1 => 'Operacija je končana',
+	-1 => 'Operacija ni uspela'
 );

 $lang ['admin'] ['maintain'] ['updates'] = array(
--- a/setup/lang/lang.it-it.php
+++ b/setup/lang/lang.it-it.php
@ -117,7 +117,7 @@ Il modo predefinito dell\'aspetto e del contenuto dell\'articolo è [url=https:/
 Inoltre supporta
   il contenuto indentato.[/code]

-I tag img e url tag hanno inoltre delle opzioni speciali. Puoi saperne di più sul [url=https://wiki.flatpress.org/doc:plugins:bbcode target=_blank rel=external]Wiki di FlatPress[/url].
+I tag img e url hanno inoltre delle opzioni speciali. Puoi saperne di più sul [url=https://wiki.flatpress.org/doc:plugins:bbcode target=_blank rel=external]Wiki di FlatPress[/url].


 [h4]Articoli e Pagine statiche[/h4]