From 9b6d25881c2bc0121368ce0060f2cc81435a920b Mon Sep 17 00:00:00 2001 From: Fraenkiman Date: Tue, 14 Feb 2023 00:15:24 +0100 Subject: [PATCH 01/11] Update contact.tpl include Smarty-function comment_form Note: Accessible Antispam Plugin is displayed, but you can send without mathematical solution --- fp-interface/sharedtpls/contact.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fp-interface/sharedtpls/contact.tpl b/fp-interface/sharedtpls/contact.tpl index 8717b63..f2b23d6 100755 --- a/fp-interface/sharedtpls/contact.tpl +++ b/fp-interface/sharedtpls/contact.tpl @@ -49,6 +49,8 @@

+ {comment_form} +
{$lang.contact.fieldset2} From 7b00ba58a11c97a26b783a9715229f06391b3c33 Mon Sep 17 00:00:00 2001 From: Fraenkiman Date: Wed, 1 Mar 2023 23:28:03 +0100 Subject: [PATCH 02/11] Italian language file correction Many thanks to eagleman --- fp-plugins/commentcenter/lang/lang.it-it.php | 10 +++++----- fp-plugins/seometataginfo/lang/lang.it-it.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fp-plugins/commentcenter/lang/lang.it-it.php b/fp-plugins/commentcenter/lang/lang.it-it.php index 023e66c..972e6c4 100644 --- a/fp-plugins/commentcenter/lang/lang.it-it.php +++ b/fp-plugins/commentcenter/lang/lang.it-it.php @@ -23,10 +23,10 @@ $lang ['admin'] ['entry'] ['commentcenter'] = array( 'entries' => 'Articoli', 'categories' => 'Categorie', 'nopolicies' => 'Non c\'è nessuna regola.', - 'all_entries' => 'Tutti i post', - 'fol_entries' => 'La regola è applicata ai seguenti post:', + 'all_entries' => 'Tutti gli articoli', + 'fol_entries' => 'La regola è applicata ai seguenti articoli:', 'fol_cats' => 'La regola è applicata ai post nelle seguenti categorie:', - 'older' => 'La regola è applicata ai post più vecchi di %d giorno/i.', + 'older' => 'La regola è applicata agli articoli più vecchi di %d giorno/i.', 'allow' => 'Permetti di commentare', 'block' => 'Blocca i commenti', 'approvation' => 'I commenti devono essere approvati', @@ -105,7 +105,7 @@ $lang ['admin'] ['entry'] ['commentcenter'] = array( 'delc_descm' => 'Stai per eliminare questi commenti: ', // Manage comments page - 'man_searcht' => 'Cerca un post', + 'man_searcht' => 'Cerca un articolo', 'man_searchd' => 'Inserisci l\'id dell\'articolo di cui vuoi gestire i commenti.', 'man_search' => 'Cerca', 'man_commfor' => 'Commenti di %s', @@ -136,7 +136,7 @@ $lang ['admin'] ['entry'] ['commentcenter'] = array( -2 => 'Si è verificato un errore durante il salvataggio della regola (forse le tue opzioni sono scorrette).', 3 => 'Regola spostata.', - -3 => 'Si è verificato un errore nello spostamento della regola (o non la si può muovere).', + -3 => 'Si è verificato un errore nello spostamento della regola (o non la si può spostare).', 4 => 'Regole rimosse.', -4 => 'Si è verificato un errore durante la rimozione delle regole (o non hai selezionato nessuna regola).', diff --git a/fp-plugins/seometataginfo/lang/lang.it-it.php b/fp-plugins/seometataginfo/lang/lang.it-it.php index 99d5dc4..1ce215c 100644 --- a/fp-plugins/seometataginfo/lang/lang.it-it.php +++ b/fp-plugins/seometataginfo/lang/lang.it-it.php @@ -19,7 +19,7 @@ $lang ['plugin'] ['seometataginfo'] = array( 'blog_page' => 'Blog', 'archive' => 'Archivio', 'category' => 'Categoria', - 'tag' => 'Tag', + 'tag' => 'Etichetta', 'contact' => 'Contatto', 'comments' => 'Commenti', 'pagenum' => 'Pagina #' From 42b03966e48796d09f749fee837164ac16cf1f45 Mon Sep 17 00:00:00 2001 From: Fraenkiman Date: Thu, 2 Mar 2023 00:16:50 +0100 Subject: [PATCH 03/11] Italian language file correction Many thanks to eagleman --- fp-plugins/prettyurls/lang/lang.it-it.php | 2 +- setup/lang/lang.it-it.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fp-plugins/prettyurls/lang/lang.it-it.php b/fp-plugins/prettyurls/lang/lang.it-it.php index b3d0962..46de8cb 100644 --- a/fp-plugins/prettyurls/lang/lang.it-it.php +++ b/fp-plugins/prettyurls/lang/lang.it-it.php @@ -29,7 +29,7 @@ 1 => '.htaccess è stato salvato con successo', -1 => '.htaccess non può essere salvato (hai i permessi di scrittura su '. BLOG_ROOT .')?', - 2 => 'Impostazioni salvate con successo', + 2 => 'Opzioni salvate con successo', -2 => 'Si è verificato un errore durante il salvataggio delle impostazioni', ); diff --git a/setup/lang/lang.it-it.php b/setup/lang/lang.it-it.php index 7c6aebe..5f314c6 100644 --- a/setup/lang/lang.it-it.php +++ b/setup/lang/lang.it-it.php @@ -1,6 +1,6 @@ 'L\'installazione è stata bloccata', From a9db325e1f289793eea8541e1505f50a9769ca08 Mon Sep 17 00:00:00 2001 From: Fraenkiman Date: Thu, 2 Mar 2023 00:44:48 +0100 Subject: [PATCH 04/11] Update lang.it-it.php --- setup/lang/lang.it-it.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/lang/lang.it-it.php b/setup/lang/lang.it-it.php index 5f314c6..7c6aebe 100644 --- a/setup/lang/lang.it-it.php +++ b/setup/lang/lang.it-it.php @@ -1,6 +1,6 @@ 'L\'installazione è stata bloccata', From f12ac4cc3a4214617fca85ee489d2eea0f9d002c Mon Sep 17 00:00:00 2001 From: Fraenkiman Date: Mon, 27 Mar 2023 01:41:31 +0200 Subject: [PATCH 05/11] Update step2.lib.php Adds the welcome entry to the Author FlatPress. Also for the static pages menu and about. See https://github.com/flatpressblog/flatpress/issues/99#issuecomment-1159540059 --- setup/lib/step2.lib.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/setup/lib/step2.lib.php b/setup/lib/step2.lib.php index 03acbc4..79689d6 100644 --- a/setup/lib/step2.lib.php +++ b/setup/lib/step2.lib.php @@ -12,7 +12,8 @@ function check_step() { 'subject' => $vl ['entry'] ['subject'], 'content' => $vl ['entry'] ['content'], 'date' => time(), - 'version' => system_ver() + 'version' => system_ver(), + 'author' => 'FlatPress' )); if (!static_exists('menu')) { @@ -20,7 +21,8 @@ function check_step() { 'subject' => $vl ['menu'] ['subject'], 'content' => $vl ['menu'] ['content'], 'date' => time(), - 'version' => system_ver() + 'version' => system_ver(), + 'author' => 'FlatPress' ), 'menu'); } if (!static_exists('about')) { @@ -28,7 +30,8 @@ function check_step() { 'subject' => $vl ['about'] ['subject'], 'content' => $vl ['about'] ['content'], 'date' => time(), - 'version' => system_ver() + 'version' => system_ver(), + 'author' => 'FlatPress' ), 'about'); } } From 0a0d4df693cf1e9d9c7ed324afc06395ca55b0e7 Mon Sep 17 00:00:00 2001 From: Fraenkiman Date: Tue, 4 Apr 2023 23:36:38 +0200 Subject: [PATCH 06/11] more corrections of files in italian language Many thanks to eagleman --- fp-interface/lang/it-it/lang.admin.php | 10 +++++----- fp-interface/lang/it-it/lang.default.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fp-interface/lang/it-it/lang.admin.php b/fp-interface/lang/it-it/lang.admin.php index 3d8a719..ed77096 100644 --- a/fp-interface/lang/it-it/lang.admin.php +++ b/fp-interface/lang/it-it/lang.admin.php @@ -4,17 +4,17 @@ $lang ['admin'] ['head'] = 'Pannello di controllo'; $lang ['admin'] ['panels'] = array( 'main' => 'Principale', 'config' => 'Opzioni', - // 'users' => 'Users', + // 'users' => 'Utenti', 'entry' => 'Articoli', 'static' => 'Pagine statiche', 'uploader' => 'Caricatore', 'widgets' => 'Widget', - // 'add' => 'Add', - // 'edit' => 'Edit/Delete', + // 'add' => 'Aggiungi', + // 'edit' => 'Modifica/Elimina', 'maintain' => 'Manutenzione', 'plugin' => 'Plugin', 'themes' => 'Temi' - // 'updates' => 'Updates', + // 'updates' => 'Aggiornamenti', ); $lang ['admin'] ['general'] = array( @@ -23,7 +23,7 @@ $lang ['admin'] ['general'] = array( 'title' => 'Titolo', # for entry/posts/static titles 'comments' => '#Commenti', 'author' => 'Autore', - 'actdel' => 'Eliimina', + 'actdel' => 'Elimina', 'actedit' => 'Modifica', 'actenable' => 'Abilita', 'actdisable' => 'Disabilita', diff --git a/fp-interface/lang/it-it/lang.default.php b/fp-interface/lang/it-it/lang.default.php index 8459d07..2c9df51 100644 --- a/fp-interface/lang/it-it/lang.default.php +++ b/fp-interface/lang/it-it/lang.default.php @@ -61,7 +61,7 @@ $lang ['staticauthor'] = array( $lang ['entryauthor'] = array( // "Posted by" in entry pages - 'posted_by' => 'Postato da', + 'posted_by' => 'Pubblicato da', 'at' => 'a' ); From 89d2373801d268342d43f94b61255e69ade5f3b1 Mon Sep 17 00:00:00 2001 From: Fraenkiman Date: Thu, 6 Apr 2023 17:09:03 +0200 Subject: [PATCH 07/11] Update lang.it-it.php --- fp-plugins/prettyurls/lang/lang.it-it.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fp-plugins/prettyurls/lang/lang.it-it.php b/fp-plugins/prettyurls/lang/lang.it-it.php index 46de8cb..b3d0962 100644 --- a/fp-plugins/prettyurls/lang/lang.it-it.php +++ b/fp-plugins/prettyurls/lang/lang.it-it.php @@ -29,7 +29,7 @@ 1 => '.htaccess è stato salvato con successo', -1 => '.htaccess non può essere salvato (hai i permessi di scrittura su '. BLOG_ROOT .')?', - 2 => 'Opzioni salvate con successo', + 2 => 'Impostazioni salvate con successo', -2 => 'Si è verificato un errore durante il salvataggio delle impostazioni', ); From 7afa71aef4b681285b8d648f2f5e7fe866a0bb1e Mon Sep 17 00:00:00 2001 From: Fraenkiman Date: Mon, 10 Apr 2023 00:52:46 +0200 Subject: [PATCH 08/11] Update contact.tpl --- fp-interface/sharedtpls/contact.tpl | 2 -- 1 file changed, 2 deletions(-) diff --git a/fp-interface/sharedtpls/contact.tpl b/fp-interface/sharedtpls/contact.tpl index f2b23d6..14138bc 100755 --- a/fp-interface/sharedtpls/contact.tpl +++ b/fp-interface/sharedtpls/contact.tpl @@ -48,8 +48,6 @@ {/if}

- - {comment_form}
From 84d75cab64a28a0972afa572b18087774ccbb950 Mon Sep 17 00:00:00 2001 From: Frank Hochmuth Date: Mon, 10 Apr 2023 00:58:02 +0200 Subject: [PATCH 09/11] Delete contact.tpl In a separate pull request moved --- fp-interface/sharedtpls/contact.tpl | 76 ----------------------------- 1 file changed, 76 deletions(-) delete mode 100755 fp-interface/sharedtpls/contact.tpl diff --git a/fp-interface/sharedtpls/contact.tpl b/fp-interface/sharedtpls/contact.tpl deleted file mode 100755 index 14138bc..0000000 --- a/fp-interface/sharedtpls/contact.tpl +++ /dev/null @@ -1,76 +0,0 @@ -

{$lang.contact.descr}

- -
- - {include file='shared:errorlist.tpl'} - -
{$lang.contact.fieldset1} -


- {if isset($error) && isset($error.name) && !empty($error.name)} - {assign var=class value="field-error"} - {else} - {assign var=class value=""} - {/if} - {if isset($values) && isset($values.name) && !empty($values.name)} - {assign var=namevalue value=$values.name} - {else} - {assign var=namevalue value=""} - {/if} -

- -


- {if isset($error) && isset($error.email) && !empty($error.email)} - {assign var=class value="field-error"} - {else} - {assign var=class value=""} - {/if} - {if isset($values) && isset($values.email) && !empty($values.email)} - {assign var=emailvalue value=$values.email} - {else} - {assign var=emailvalue value=""} - {/if} -

- -


- {if isset($error) && isset($error.url) && !empty($error.url)} - {assign var=class value="field-error"} - {else} - {assign var=class value=""} - {/if} - {if isset($values) && isset($values.url) && !empty($values.url)} - {assign var=urlvalue value=$values.url} - {else} - {assign var=urlvalue value=""} - {/if} -

- -
- -
{$lang.contact.fieldset2} -


- {if isset($error) && isset($error.content) && !empty($error.content)} - {assign var=class value="field-error"} - {else} - {assign var=class value=""} - {/if} - {if isset($values) && isset($values.content) && !empty($values.content)} - {assign var=contentvalue value=$values.content} - {else} - {assign var=contentvalue value=""} - {/if} -

- -
- -
- - -
- -
From 1e0ad07d78ed5f05d0133fe08f98a1f1ccfd36f6 Mon Sep 17 00:00:00 2001 From: Fraenkiman Date: Mon, 10 Apr 2023 01:05:56 +0200 Subject: [PATCH 10/11] Create contact.tpl --- fp-interface/sharedtpls/contact.tpl | 76 +++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 fp-interface/sharedtpls/contact.tpl diff --git a/fp-interface/sharedtpls/contact.tpl b/fp-interface/sharedtpls/contact.tpl new file mode 100644 index 0000000..14138bc --- /dev/null +++ b/fp-interface/sharedtpls/contact.tpl @@ -0,0 +1,76 @@ +

{$lang.contact.descr}

+ +
+ + {include file='shared:errorlist.tpl'} + +
{$lang.contact.fieldset1} +


+ {if isset($error) && isset($error.name) && !empty($error.name)} + {assign var=class value="field-error"} + {else} + {assign var=class value=""} + {/if} + {if isset($values) && isset($values.name) && !empty($values.name)} + {assign var=namevalue value=$values.name} + {else} + {assign var=namevalue value=""} + {/if} +

+ +


+ {if isset($error) && isset($error.email) && !empty($error.email)} + {assign var=class value="field-error"} + {else} + {assign var=class value=""} + {/if} + {if isset($values) && isset($values.email) && !empty($values.email)} + {assign var=emailvalue value=$values.email} + {else} + {assign var=emailvalue value=""} + {/if} +

+ +


+ {if isset($error) && isset($error.url) && !empty($error.url)} + {assign var=class value="field-error"} + {else} + {assign var=class value=""} + {/if} + {if isset($values) && isset($values.url) && !empty($values.url)} + {assign var=urlvalue value=$values.url} + {else} + {assign var=urlvalue value=""} + {/if} +

+ +
+ +
{$lang.contact.fieldset2} +


+ {if isset($error) && isset($error.content) && !empty($error.content)} + {assign var=class value="field-error"} + {else} + {assign var=class value=""} + {/if} + {if isset($values) && isset($values.content) && !empty($values.content)} + {assign var=contentvalue value=$values.content} + {else} + {assign var=contentvalue value=""} + {/if} +

+ +
+ +
+ + +
+ +
From 22e00361c7750a0d1fe766690f84b405c576ff5f Mon Sep 17 00:00:00 2001 From: Fraenkiman Date: Mon, 10 Apr 2023 01:29:31 +0200 Subject: [PATCH 11/11] Update contact.tpl --- fp-interface/sharedtpls/contact.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fp-interface/sharedtpls/contact.tpl b/fp-interface/sharedtpls/contact.tpl index 14138bc..8717b63 100644 --- a/fp-interface/sharedtpls/contact.tpl +++ b/fp-interface/sharedtpls/contact.tpl @@ -48,7 +48,7 @@ {/if}

- +
{$lang.contact.fieldset2}