From 24f09332ce2b5ca9c996131023fa35e78dd87da3 Mon Sep 17 00:00:00 2001 From: dignajar Date: Wed, 23 Sep 2015 21:13:52 -0300 Subject: [PATCH 01/29] Updates --- kernel/boot/init.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/boot/init.php b/kernel/boot/init.php index d27d2090..73d8fd44 100644 --- a/kernel/boot/init.php +++ b/kernel/boot/init.php @@ -162,6 +162,10 @@ define('JQUERY', HTML_PATH_ADMIN_THEME_JS.'jquery.min.js'); // PHP paths with dependency define('PATH_THEME', PATH_ROOT.'themes/'.$Site->theme().'/'); define('PATH_THEME_PHP', PATH_THEME.'php'.DS); +define('PATH_THEME_CSS', PATH_THEME.'css'.DS); +define('PATH_THEME_JS', PATH_THEME.'js'.DS); +define('PATH_THEME_IMG', PATH_THEME.'img'.DS); +define('PATH_THEME_LANG', PATH_THEME.'languages'.DS); // Objects with dependency $Language = new dbLanguage( $Site->locale() ); From afe5fa1f963aff84e2d52bd2ad848340252df8e4 Mon Sep 17 00:00:00 2001 From: clickwork-git Date: Thu, 24 Sep 2015 20:37:22 +0200 Subject: [PATCH 02/29] Create de_DE.json --- plugins/maintancemode/languages/de_DE.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 plugins/maintancemode/languages/de_DE.json diff --git a/plugins/maintancemode/languages/de_DE.json b/plugins/maintancemode/languages/de_DE.json new file mode 100644 index 00000000..58fec6b2 --- /dev/null +++ b/plugins/maintancemode/languages/de_DE.json @@ -0,0 +1,15 @@ +{ + "plugin-data": + { + "name": "Wartungsmodus", + "description": "Wartungsmodus für die Website mit Zugang zum Admin-Bereich.", + "author": "Bludit", + "email": "", + "website": "http://www.bludit.com", + "version": "0.1", + "releaseDate": "2016-09-25" + }, + + "enable-maintence-mode": "Aktivierung des Wartungsmodus", + "message": "Auf der Website angezeigter Hinweis" +} From 448627db86a6631f5e64ae65d2cf2c0d99faab38 Mon Sep 17 00:00:00 2001 From: clickwork-git Date: Thu, 24 Sep 2015 20:40:18 +0200 Subject: [PATCH 03/29] Change to UTF-8 --- plugins/simplemde/languages/de_DE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/simplemde/languages/de_DE.json b/plugins/simplemde/languages/de_DE.json index 9e026f0b..422bce94 100644 --- a/plugins/simplemde/languages/de_DE.json +++ b/plugins/simplemde/languages/de_DE.json @@ -2,7 +2,7 @@ "plugin-data": { "name": "SimpleMDE", - "description": "Ein einfacher und schöner JavaScript-Editor fü Markdown von @WesCossick. Angepasst für Bludit von Diego Najar.", + "description": "Ein einfacher und schöner JavaScript-Editor für; Markdown von @WesCossick. Angepasst für Bludit von Diego Najar.", "author": "NextStepWebs", "email": "", "website": "https://github.com/NextStepWebs/simplemde-markdown-editor", @@ -10,5 +10,5 @@ "releaseDate": "2015-09-22" }, "toolbar": "Werkzeugleiste", - "tab-size": "Abstände der Tabstopps" + "tab-size": "Abstände der Tabstopps" } From 128ba0b6428b3d9378a33a05f5344d39965c6625 Mon Sep 17 00:00:00 2001 From: clickwork-git Date: Thu, 24 Sep 2015 20:41:02 +0200 Subject: [PATCH 04/29] Change to UTF-8 --- plugins/tags/languages/de_DE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/tags/languages/de_DE.json b/plugins/tags/languages/de_DE.json index 3f1ee0c5..034b1820 100644 --- a/plugins/tags/languages/de_DE.json +++ b/plugins/tags/languages/de_DE.json @@ -1,8 +1,8 @@ { "plugin-data": { - "name": "Liste aller Schlagwörter", - "description": "Anzeige aller Schlagwörter.", + "name": "Liste aller Schlagwörter", + "description": "Anzeige aller Schlagwörter.", "author": "Bludit", "email": "", "website": "http://www.bludit.com", From 55acbc8bb4709a98f8d7fe800d5ff0c94cddd3f8 Mon Sep 17 00:00:00 2001 From: clickwork-git Date: Thu, 24 Sep 2015 20:51:14 +0200 Subject: [PATCH 05/29] Create de_DE.json --- plugins/opengraph/languages/de_DE.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 plugins/opengraph/languages/de_DE.json diff --git a/plugins/opengraph/languages/de_DE.json b/plugins/opengraph/languages/de_DE.json new file mode 100644 index 00000000..c4a68e41 --- /dev/null +++ b/plugins/opengraph/languages/de_DE.json @@ -0,0 +1,12 @@ +{ + "plugin-data": + { + "name": "Open Graph", + "description": "Plugin zur Verwendung des Open Graph Protocols.", + "author": "Bludit", + "email": "", + "website": "http://www.bludit.com", + "version": "0.1", + "releaseDate": "2015-09-25" + } +} From ca7cabaa74a40370be70c4e6c0c70e81a73a78f8 Mon Sep 17 00:00:00 2001 From: clickwork-git Date: Thu, 24 Sep 2015 20:52:16 +0200 Subject: [PATCH 06/29] Small correction --- plugins/tags/languages/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/tags/languages/de_DE.json b/plugins/tags/languages/de_DE.json index 034b1820..b2245c99 100644 --- a/plugins/tags/languages/de_DE.json +++ b/plugins/tags/languages/de_DE.json @@ -7,6 +7,6 @@ "email": "", "website": "http://www.bludit.com", "version": "0.1", - "releaseDate": "2015-09-22" + "releaseDate": "2015-09-25" } } From fe3d48a0f6898e2a81a91dfa69d0c2dc7de09eba Mon Sep 17 00:00:00 2001 From: clickwork-git Date: Thu, 24 Sep 2015 20:52:49 +0200 Subject: [PATCH 07/29] Update de_DE.json --- plugins/simplemde/languages/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/simplemde/languages/de_DE.json b/plugins/simplemde/languages/de_DE.json index 422bce94..569b9de4 100644 --- a/plugins/simplemde/languages/de_DE.json +++ b/plugins/simplemde/languages/de_DE.json @@ -7,7 +7,7 @@ "email": "", "website": "https://github.com/NextStepWebs/simplemde-markdown-editor", "version": "1.7.1", - "releaseDate": "2015-09-22" + "releaseDate": "2015-09-25" }, "toolbar": "Werkzeugleiste", "tab-size": "Abstände der Tabstopps" From 247e2d25b7365dcbb54f665f3467e33a66dd6cc9 Mon Sep 17 00:00:00 2001 From: clickwork-git Date: Thu, 24 Sep 2015 21:06:31 +0200 Subject: [PATCH 08/29] Create de_DE.json --- plugins/disqus/languages/de_DE.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 plugins/disqus/languages/de_DE.json diff --git a/plugins/disqus/languages/de_DE.json b/plugins/disqus/languages/de_DE.json new file mode 100644 index 00000000..fa9a1f01 --- /dev/null +++ b/plugins/disqus/languages/de_DE.json @@ -0,0 +1,16 @@ +{ + "plugin-data": + { + "name": "Disqus", + "description": "Disqus ist eine Kommentar-Plattform für Websites. Um das Plugin verwenden zu können, muss ein Konto bei Disqus.com eingerichtet werden.", + "author": "Bludit", + "email": "", + "website": "http://www.bludit.com", + "version": "0.1", + "releaseDate": "2015-09-25" + }, + "disqus-shortname": "Disqus shortname", + "enable-disqus-on-pages": "Disqus auf Seiten verwenden", + "enable-disqus-on-posts": "Disqus bei Beiträgen verwenden", + "enable-disqus-on-default-home-page": "Disqus auf der Hauptseite verwenden" +} From c93e044128a6eb3464a1f82297051429bcbea514 Mon Sep 17 00:00:00 2001 From: dignajar Date: Sat, 26 Sep 2015 23:24:41 -0300 Subject: [PATCH 09/29] Remove version and others fields --- kernel/parsedown.class.php | 60 +++++++++++----------- plugins/disqus/languages/de_DE.json | 7 +-- plugins/disqus/languages/es_AR.json | 7 +-- plugins/disqus/languages/fr_FR.json | 7 +-- plugins/maintancemode/languages/de_DE.json | 9 +--- plugins/maintancemode/languages/es_AR.json | 7 +-- plugins/maintancemode/languages/fr_FR.json | 7 +-- plugins/maintancemode/languages/zh_TW.json | 9 +--- plugins/opengraph/languages/de_DE.json | 9 +--- plugins/opengraph/languages/en_US.json | 7 +-- plugins/opengraph/languages/es_AR.json | 7 +-- plugins/opengraph/languages/fr_FR.json | 7 +-- plugins/opengraph/languages/zh_TW.json | 7 +-- plugins/pages/languages/de_DE.json | 9 +--- plugins/pages/languages/es_AR.json | 7 +-- plugins/pages/languages/fr_FR.json | 7 +-- plugins/pages/languages/zh_TW.json | 9 +--- plugins/simplemde/languages/de_DE.json | 9 +--- plugins/simplemde/languages/es_AR.json | 7 +-- plugins/simplemde/languages/fr_FR.json | 7 +-- plugins/tags/languages/de_DE.json | 9 +--- plugins/tags/languages/fr_FR.json | 7 +-- 22 files changed, 58 insertions(+), 163 deletions(-) diff --git a/kernel/parsedown.class.php b/kernel/parsedown.class.php index 55640fb2..d7e1e034 100644 --- a/kernel/parsedown.class.php +++ b/kernel/parsedown.class.php @@ -17,7 +17,7 @@ class Parsedown { # ~ - const version = '1.5.3'; + const version = '1.5.4'; # ~ @@ -107,12 +107,6 @@ class Parsedown # ~ - protected $DefinitionTypes = array( - '[' => array('Reference'), - ); - - # ~ - protected $unmarkedBlockTypes = array( 'Code', ); @@ -169,7 +163,7 @@ class Parsedown # ~ - if (isset($CurrentBlock['incomplete'])) + if (isset($CurrentBlock['continuable'])) { $Block = $this->{'block'.$CurrentBlock['type'].'Continue'}($Line, $CurrentBlock); @@ -185,8 +179,6 @@ class Parsedown { $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock); } - - unset($CurrentBlock['incomplete']); } } @@ -226,7 +218,7 @@ class Parsedown if (method_exists($this, 'block'.$blockType.'Continue')) { - $Block['incomplete'] = true; + $Block['continuable'] = true; } $CurrentBlock = $Block; @@ -253,7 +245,7 @@ class Parsedown # ~ - if (isset($CurrentBlock['incomplete']) and method_exists($this, 'block'.$CurrentBlock['type'].'Complete')) + if (isset($CurrentBlock['continuable']) and method_exists($this, 'block'.$CurrentBlock['type'].'Complete')) { $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock); } @@ -394,16 +386,16 @@ class Parsedown protected function blockFencedCode($Line) { - if (preg_match('/^(['.$Line['text'][0].']{3,})[ ]*([\w-]+)?[ ]*$/', $Line['text'], $matches)) + if (preg_match('/^['.$Line['text'][0].']{3,}[ ]*([\w-]+)?[ ]*$/', $Line['text'], $matches)) { $Element = array( 'name' => 'code', 'text' => '', ); - if (isset($matches[2])) + if (isset($matches[1])) { - $class = 'language-'.$matches[2]; + $class = 'language-'.$matches[1]; $Element['attributes'] = array( 'class' => $class, @@ -673,7 +665,9 @@ class Parsedown if (preg_match('/^<(\w*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches)) { - if (in_array($matches[1], $this->textLevelElements)) + $element = strtolower($matches[1]); + + if (in_array($element, $this->textLevelElements)) { return; } @@ -987,15 +981,13 @@ class Parsedown { $markup = ''; - $unexaminedText = $text; + # $excerpt is based on the first occurrence of a marker - $markerPosition = 0; - - while ($excerpt = strpbrk($unexaminedText, $this->inlineMarkerList)) + while ($excerpt = strpbrk($text, $this->inlineMarkerList)) { $marker = $excerpt[0]; - $markerPosition += strpos($unexaminedText, $marker); + $markerPosition = strpos($text, $marker); $Excerpt = array('text' => $excerpt, 'context' => $text); @@ -1008,34 +1000,42 @@ class Parsedown continue; } - if (isset($Inline['position']) and $Inline['position'] > $markerPosition) # position is ahead of marker + # makes sure that the inline belongs to "our" marker + + if (isset($Inline['position']) and $Inline['position'] > $markerPosition) { continue; } + # sets a default inline position + if ( ! isset($Inline['position'])) { $Inline['position'] = $markerPosition; } + # the text that comes before the inline $unmarkedText = substr($text, 0, $Inline['position']); + # compile the unmarked text $markup .= $this->unmarkedText($unmarkedText); + # compile the inline $markup .= isset($Inline['markup']) ? $Inline['markup'] : $this->element($Inline['element']); + # remove the examined text $text = substr($text, $Inline['position'] + $Inline['extent']); - $unexaminedText = $text; - - $markerPosition = 0; - continue 2; } - $unexaminedText = substr($excerpt, 1); + # the marker does not belong to an inline - $markerPosition ++; + $unmarkedText = substr($text, 0, $markerPosition + 1); + + $markup .= $this->unmarkedText($unmarkedText); + + $text = substr($text, $markerPosition + 1); } $markup .= $this->unmarkedText($text); @@ -1476,7 +1476,7 @@ class Parsedown return self::$instances[$name]; } - $instance = new self(); + $instance = new static(); self::$instances[$name] = $instance; @@ -1525,4 +1525,4 @@ class Parsedown 'wbr', 'span', 'time', ); -} +} \ No newline at end of file diff --git a/plugins/disqus/languages/de_DE.json b/plugins/disqus/languages/de_DE.json index fa9a1f01..8c5a30d8 100644 --- a/plugins/disqus/languages/de_DE.json +++ b/plugins/disqus/languages/de_DE.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Disqus", - "description": "Disqus ist eine Kommentar-Plattform für Websites. Um das Plugin verwenden zu können, muss ein Konto bei Disqus.com eingerichtet werden.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-09-25" + "description": "Disqus ist eine Kommentar-Plattform für Websites. Um das Plugin verwenden zu können, muss ein Konto bei Disqus.com eingerichtet werden." }, "disqus-shortname": "Disqus shortname", "enable-disqus-on-pages": "Disqus auf Seiten verwenden", diff --git a/plugins/disqus/languages/es_AR.json b/plugins/disqus/languages/es_AR.json index 4f67f2ec..f956f048 100644 --- a/plugins/disqus/languages/es_AR.json +++ b/plugins/disqus/languages/es_AR.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Disqus sistema de comentarios", - "description": "Disqus es un servicio de comentarios online. Es necesario registrarse en Disqus.com antes de utilizar este plugin.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-08-17" + "description": "Disqus es un servicio de comentarios online. Es necesario registrarse en Disqus.com antes de utilizar este plugin." }, "disqus-shortname": "Disqus shortname", "enable-disqus-on-pages": "Habilitar Disqus en las páginas", diff --git a/plugins/disqus/languages/fr_FR.json b/plugins/disqus/languages/fr_FR.json index 146eaf44..ffe5c999 100644 --- a/plugins/disqus/languages/fr_FR.json +++ b/plugins/disqus/languages/fr_FR.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Disqus système de commentaire", - "description": "Disqus est un service Web de discussion et de commentaires d'articles centralisé avec authentification unique. Il est nécessaire de s’inscrire sur Disqus.com avant d’utiliser ce plugin.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-08-02" + "description": "Disqus est un service Web de discussion et de commentaires d'articles centralisé avec authentification unique. Il est nécessaire de s’inscrire sur Disqus.com avant d’utiliser ce plugin." }, "disqus-shortname": "Votre ID Disqus", "enable-disqus-on-pages": "Activer Disqus sur les pages", diff --git a/plugins/maintancemode/languages/de_DE.json b/plugins/maintancemode/languages/de_DE.json index 58fec6b2..369cec5a 100644 --- a/plugins/maintancemode/languages/de_DE.json +++ b/plugins/maintancemode/languages/de_DE.json @@ -2,14 +2,9 @@ "plugin-data": { "name": "Wartungsmodus", - "description": "Wartungsmodus für die Website mit Zugang zum Admin-Bereich.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2016-09-25" + "description": "Wartungsmodus für die Website mit Zugang zum Admin-Bereich." }, "enable-maintence-mode": "Aktivierung des Wartungsmodus", "message": "Auf der Website angezeigter Hinweis" -} +} \ No newline at end of file diff --git a/plugins/maintancemode/languages/es_AR.json b/plugins/maintancemode/languages/es_AR.json index eea7b378..cad06dfa 100644 --- a/plugins/maintancemode/languages/es_AR.json +++ b/plugins/maintancemode/languages/es_AR.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Modo mantenimiento", - "description": "Configurar el sitio en modo mantenimiento, se puede acceder al panel de administración mientras tanto.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-08-02" + "description": "Configurar el sitio en modo mantenimiento, se puede acceder al panel de administración mientras tanto." }, "enable-maintence-mode": "Habilitar modo mantenimiento", diff --git a/plugins/maintancemode/languages/fr_FR.json b/plugins/maintancemode/languages/fr_FR.json index 72849329..2596edab 100644 --- a/plugins/maintancemode/languages/fr_FR.json +++ b/plugins/maintancemode/languages/fr_FR.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Mode de Maintenance", - "description": "Configurer votre site sur le mode de maintenance, vous pouvez accéder à la zone d'administration.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-08-02" + "description": "Configurer votre site sur le mode de maintenance, vous pouvez accéder à la zone d'administration." }, "enable-maintence-mode": "Activer le mode de maintence", diff --git a/plugins/maintancemode/languages/zh_TW.json b/plugins/maintancemode/languages/zh_TW.json index 0df80e88..ce7d5ed8 100644 --- a/plugins/maintancemode/languages/zh_TW.json +++ b/plugins/maintancemode/languages/zh_TW.json @@ -2,14 +2,9 @@ "plugin-data": { "name": "維護模式", - "description": "設定您的網站為維護模式，但是您依然可以登入到管理介面", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-08-02" + "description": "設定您的網站為維護模式，但是您依然可以登入到管理介面" }, "enable-maintence-mode": "啟用維護模式", "message": "訊息" -} +} \ No newline at end of file diff --git a/plugins/opengraph/languages/de_DE.json b/plugins/opengraph/languages/de_DE.json index c4a68e41..937d2e79 100644 --- a/plugins/opengraph/languages/de_DE.json +++ b/plugins/opengraph/languages/de_DE.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "Open Graph", - "description": "Plugin zur Verwendung des Open Graph Protocols.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-09-25" + "description": "Plugin zur Verwendung des Open Graph Protocols." } -} +} \ No newline at end of file diff --git a/plugins/opengraph/languages/en_US.json b/plugins/opengraph/languages/en_US.json index c9d8afe3..2360859f 100644 --- a/plugins/opengraph/languages/en_US.json +++ b/plugins/opengraph/languages/en_US.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "Open Graph", - "description": "The Open Graph protocol enables any web page to become a rich object in a social graph.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-08-02" + "description": "The Open Graph protocol enables any web page to become a rich object in a social graph." } } \ No newline at end of file diff --git a/plugins/opengraph/languages/es_AR.json b/plugins/opengraph/languages/es_AR.json index 1dd40da4..69fdb447 100644 --- a/plugins/opengraph/languages/es_AR.json +++ b/plugins/opengraph/languages/es_AR.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "Open Graph", - "description": "El protocolo Open Graph sirve para publicar contenido en las redes sociales.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-08-02" + "description": "El protocolo Open Graph sirve para publicar contenido en las redes sociales." } } \ No newline at end of file diff --git a/plugins/opengraph/languages/fr_FR.json b/plugins/opengraph/languages/fr_FR.json index f64eeb3b..adcade7d 100644 --- a/plugins/opengraph/languages/fr_FR.json +++ b/plugins/opengraph/languages/fr_FR.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "Open Graph", - "description": "Permets à n’importe quelle page web de devenir l’objet enrichi d’un graphe social. Par exemple, il est utilisé sur Facebook pour permettre à une page web de bénéficier des mêmes fonctionnalités que n’importe quel autre objet sur Facebook.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-08-02" + "description": "Permets à n’importe quelle page web de devenir l’objet enrichi d’un graphe social. Par exemple, il est utilisé sur Facebook pour permettre à une page web de bénéficier des mêmes fonctionnalités que n’importe quel autre objet sur Facebook." } } \ No newline at end of file diff --git a/plugins/opengraph/languages/zh_TW.json b/plugins/opengraph/languages/zh_TW.json index 394d068d..18122e8b 100644 --- a/plugins/opengraph/languages/zh_TW.json +++ b/plugins/opengraph/languages/zh_TW.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "開放社交關係圖", - "description": "開放社交關係圖協定可以讓任何網頁變成豐富的物件", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-08-02" + "description": "開放社交關係圖協定可以讓任何網頁變成豐富的物件" } } diff --git a/plugins/pages/languages/de_DE.json b/plugins/pages/languages/de_DE.json index 9dd58d16..c699b09c 100644 --- a/plugins/pages/languages/de_DE.json +++ b/plugins/pages/languages/de_DE.json @@ -2,14 +2,9 @@ "plugin-data": { "name": "Liste aller Seiten", - "description": "Auflistung aller Seiten.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-09-22" + "description": "Auflistung aller Seiten." }, "home": "Hauptseite", "show-home-link": "Hauptseite zeigen" -} +} \ No newline at end of file diff --git a/plugins/pages/languages/es_AR.json b/plugins/pages/languages/es_AR.json index 1a80bd31..6ee99a19 100644 --- a/plugins/pages/languages/es_AR.json +++ b/plugins/pages/languages/es_AR.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Listado de páginas", - "description": "Muestra las paginas en orden según la posición.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-08-02" + "description": "Muestra las paginas en orden según la posición." }, "home": "Página de inicio", diff --git a/plugins/pages/languages/fr_FR.json b/plugins/pages/languages/fr_FR.json index 2091b2ae..e74fe901 100644 --- a/plugins/pages/languages/fr_FR.json +++ b/plugins/pages/languages/fr_FR.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Page navigation", - "description": "Constitue un menu avec les liens des pages dans la colonne du thème.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-08-02" + "description": "Constitue un menu avec les liens des pages dans la colonne du thème." }, "home": "Accueil", diff --git a/plugins/pages/languages/zh_TW.json b/plugins/pages/languages/zh_TW.json index c6c5fd59..7ee59e60 100644 --- a/plugins/pages/languages/zh_TW.json +++ b/plugins/pages/languages/zh_TW.json @@ -2,14 +2,9 @@ "plugin-data": { "name": "頁面列表", - "description": "顯示所有頁面的列表", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-08-02" + "description": "顯示所有頁面的列表" }, "home": "首頁", "show-home-link": "顯示首頁連結" -} +} \ No newline at end of file diff --git a/plugins/simplemde/languages/de_DE.json b/plugins/simplemde/languages/de_DE.json index 569b9de4..f13f8307 100644 --- a/plugins/simplemde/languages/de_DE.json +++ b/plugins/simplemde/languages/de_DE.json @@ -2,13 +2,8 @@ "plugin-data": { "name": "SimpleMDE", - "description": "Ein einfacher und schöner JavaScript-Editor für; Markdown von @WesCossick. Angepasst für Bludit von Diego Najar.", - "author": "NextStepWebs", - "email": "", - "website": "https://github.com/NextStepWebs/simplemde-markdown-editor", - "version": "1.7.1", - "releaseDate": "2015-09-25" + "description": "Ein einfacher und schöner JavaScript-Editor für; Markdown von @WesCossick. Angepasst für Bludit von Diego Najar." }, "toolbar": "Werkzeugleiste", "tab-size": "Abstände der Tabstopps" -} +} \ No newline at end of file diff --git a/plugins/simplemde/languages/es_AR.json b/plugins/simplemde/languages/es_AR.json index a08763cd..f880b520 100644 --- a/plugins/simplemde/languages/es_AR.json +++ b/plugins/simplemde/languages/es_AR.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "SimpleMDE", - "description": "Simple, facil y hermoso editor Markdown desarrollado por @WesCossick. Adaptado por Diego Najar para Bludit.", - "author": "NextStepWebs", - "email": "", - "website": "https://github.com/NextStepWebs/simplemde-markdown-editor", - "version": "1.7.1", - "releaseDate": "2015-09-18" + "description": "Simple, facil y hermoso editor Markdown desarrollado por @WesCossick. Adaptado por Diego Najar para Bludit." }, "toolbar": "Barra de herramientas", "tab-size": "Tamaño de la tabulación" diff --git a/plugins/simplemde/languages/fr_FR.json b/plugins/simplemde/languages/fr_FR.json index 6a797b07..ae8c299a 100644 --- a/plugins/simplemde/languages/fr_FR.json +++ b/plugins/simplemde/languages/fr_FR.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "SimpleMDE", - "description": "Un éditeur Markdown en JavaScript simple, beau, et intégrable.", - "author": "NextStepWebs", - "email": "", - "website": "https://github.com/NextStepWebs/simplemde-markdown-editor", - "version": "1.7.1", - "releaseDate": "2015-09-18" + "description": "Un éditeur Markdown en JavaScript simple, beau, et intégrable." }, "toolbar": "Toolbar", "tab-size": "Tab size" diff --git a/plugins/tags/languages/de_DE.json b/plugins/tags/languages/de_DE.json index b2245c99..c07b69f4 100644 --- a/plugins/tags/languages/de_DE.json +++ b/plugins/tags/languages/de_DE.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "Liste aller Schlagwörter", - "description": "Anzeige aller Schlagwörter.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-09-25" + "description": "Anzeige aller Schlagwörter." } -} +} \ No newline at end of file diff --git a/plugins/tags/languages/fr_FR.json b/plugins/tags/languages/fr_FR.json index 63a52daf..36575d23 100644 --- a/plugins/tags/languages/fr_FR.json +++ b/plugins/tags/languages/fr_FR.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "Liste de mots clés", - "description": "Affiche la lise de tous les mots clés.", - "author": "Bludit", - "email": "", - "website": "http://www.bludit.com", - "version": "0.1", - "releaseDate": "2015-08-02" + "description": "Affiche la lise de tous les mots clés." } } \ No newline at end of file From 1e2692dd552f4471522141138dab69d2ebe4a6e1 Mon Sep 17 00:00:00 2001 From: dignajar Date: Mon, 28 Sep 2015 22:57:26 -0300 Subject: [PATCH 10/29] New plugin Google Tools --- kernel/dbpages.class.php | 13 +++-- plugins/googletools/languages/en_US.json | 16 ++++++ plugins/googletools/languages/es_AR.json | 11 +++++ plugins/googletools/plugin.php | 63 ++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 plugins/googletools/languages/en_US.json create mode 100644 plugins/googletools/languages/es_AR.json create mode 100644 plugins/googletools/plugin.php diff --git a/kernel/dbpages.class.php b/kernel/dbpages.class.php index 61933d7f..af815b1d 100644 --- a/kernel/dbpages.class.php +++ b/kernel/dbpages.class.php @@ -333,10 +333,6 @@ class dbPages extends dbJSON } } - $fields['status'] = CLI_STATUS; - $fields['date'] = Date::current(DB_DATE_FORMAT); - $fields['username'] = 'admin'; - //$tmpPaths = glob(PATH_PAGES.'*', GLOB_ONLYDIR); $tmpPaths = Filesystem::listDirectories(PATH_PAGES); foreach($tmpPaths as $directory) @@ -364,7 +360,14 @@ class dbPages extends dbJSON foreach($newPaths as $key=>$value) { - if(!isset($this->db[$key])) { + if(!isset($this->db[$key])) + { + // Default values for the new pages. + $fields['status'] = CLI_STATUS; + $fields['date'] = Date::current(DB_DATE_FORMAT); + $fields['username'] = 'admin'; + + // Create the entry for the new page. $this->db[$key] = $fields; } diff --git a/plugins/googletools/languages/en_US.json b/plugins/googletools/languages/en_US.json new file mode 100644 index 00000000..1e2b8fc9 --- /dev/null +++ b/plugins/googletools/languages/en_US.json @@ -0,0 +1,16 @@ +{ + "plugin-data": + { + "name": "Google Tools", + "description": "This plugin generate the meta tag to validate your site with Google Webmasters Tools and the JavaScript code to track your site with Google Analytics.", + "author": "Bludit", + "email": "", + "website": "", + "version": "1.0", + "releaseDate": "2015-09-28" + }, + "google-webmasters-tools": "Google Webmasters tools", + "google-analytics-tracking-id": "Google Analytics Tracking ID", + "complete-this-field-with-the-google-site-verification": "Complete this field with the Google Site verification to verify the site owner.", + "complete-this-field-with-the-tracking-id": "Complete this field with the Tracking ID to generate the Javascript tracking code for Google Analytics." +} \ No newline at end of file diff --git a/plugins/googletools/languages/es_AR.json b/plugins/googletools/languages/es_AR.json new file mode 100644 index 00000000..9ffa450f --- /dev/null +++ b/plugins/googletools/languages/es_AR.json @@ -0,0 +1,11 @@ +{ + "plugin-data": + { + "name": "Herramientas de Google", + "description": "Este plugin genera los meta tags para validar el sitio con Google Webmasters Tools y el codigo JavaScript para trackear el sitio con Google Analytics." + }, + "google-webmasters-tools": "Google Webmasters tools", + "google-analytics-tracking-id": "Google Analytics Tracking ID", + "complete-this-field-with-the-google-site-verification": "Complete este campo con el código de verificación de Google Webmasters Tools para verificar la propiedad del sitio.", + "complete-this-field-with-the-tracking-id": "Complete este campo con el Tracking ID para generar el código Javascript para trackear el sitio." +} \ No newline at end of file diff --git a/plugins/googletools/plugin.php b/plugins/googletools/plugin.php new file mode 100644 index 00000000..10461354 --- /dev/null +++ b/plugins/googletools/plugin.php @@ -0,0 +1,63 @@ +dbFields = array( + 'tracking-id'=>'', + 'google-site-verification'=>'' + ); + } + + public function form() + { + global $Language; + + $html = '
'; + $html .= ''; + $html .= ''; + $html .= '
'.$Language->get('complete-this-field-with-the-google-site-verification').'
'; + $html .= '
'; + + $html .= '
'; + $html .= ''; + $html .= ''; + $html .= '
'.$Language->get('complete-this-field-with-the-tracking-id').'
'; + $html .= '
'; + + return $html; + } + + public function siteHead() + { + $html = PHP_EOL.''.PHP_EOL; + $html .= ''.PHP_EOL; + + if(Text::isEmpty($this->getDbField('google-site-verification'))) { + return false; + } + + return $html; + } + + public function siteBodyEnd() + { + $html = PHP_EOL.''.PHP_EOL; + $html .= "".PHP_EOL; + + if(Text::isEmpty($this->getDbField('tracking-id'))) { + return false; + } + + return $html; + } +} \ No newline at end of file From 76b8494c6e321b88f96c38e0414502217f7b4bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=92=D0=BE=D1=80?= =?UTF-8?q?=D0=BE=D0=BD?= Date: Tue, 29 Sep 2015 12:26:32 +0700 Subject: [PATCH 11/29] Update Russian language --- languages/ru_RU.json | 255 ++++++++++++++++++++++++++----------------- 1 file changed, 157 insertions(+), 98 deletions(-) diff --git a/languages/ru_RU.json b/languages/ru_RU.json index c21e1551..5c4b1609 100644 --- a/languages/ru_RU.json +++ b/languages/ru_RU.json @@ -3,106 +3,165 @@ { "native": "Русский (Россия)", "english-name": "Russian", - "last-update": "2015-07-14", - "author": "voron", + "last-update": "2015-09-29", + "author": "Сергей ворон", "email": "sergey@voron.pw", "website": "voron.pw" }, - "username": "Логин", - "password": "Пароль", - "confirm-password": "Подтвердите пароль", - "editor": "Редактор", - "dashboard": "Панель управления", - "role": "Роль", - "posts": "Записи", - "users": "Пользователи", - "administrator": "Администратор", - "add": "Добавить", - "cancel": "Отмена", - "content": "Материал", - "title": "Заголовок", - "no-parent": "Нет родителя", - "edit-page": "Редактировать страницу", - "edit-post": "Редактировать запись", - "add-a-new-user": "Добавить пользователя", - "parent": "Родитель", - "friendly-url": "Дружественные URL", - "description": "Описание", - "posted-by": "Опубликовал", - "tags": "Теги", - "position": "Позиция", - "save": "Сохранить", - "draft": "Черновик", - "delete": "Удалить", - "registered": "Зарегистрирован", - "Notifications": "Уведомления", - "profile": "Профиль", - "email": "Email", - "settings": "Настройки", - "general": "Основные", - "advanced": "Дополнительно", - "regional": "Региональные", - "about": "О системе", - "login": "Войти", - "logout": "Выйти", - "manage": "Управление", - "themes": "Темы", - "configure-plugin": "Настройка плагина", - "confirm-delete-this-action-cannot-be-undone": "Подтвердите удаление, это действие не может быть отменено.", - "site-title": "Название сайта", - "site-slogan": "Слоган сайта", - "site-description": "Описание сайта", - "footer-text": "Текст нижней части страницы", - "posts-per-page": "Записей на страницу", - "site-url": "URL сайта", - "writting-settings": "Настройки написания", - "url-filters": "URL фильтры", - "pages": "Страници", - "home": "Главная", - "welcome-back": "Добро пожаловать", - "language": "Язык", - "website": "Сайт", - "timezone": "Часовой пояс", - "locale": "Место пребывания", - "notifications": "Уведомления", - "new-post": "Новыя запись", - "html-and-markdown-code-supported": "Поддерживается код HTML и Markdown", - "new-page": "Новая страница", - "manage-posts": "Управление записями", - "published-date": "Дата публикации", - "modified-date": "Дата редактирования", - "empty-title": "Пустой заголовок", - "plugins": "Плагины", - "install-plugin": "Установить плагин", - "uninstall-plugin": "Удалить плагин", - "new-password": "Новый пароль", - "edit-user": "Редактировать пользователя", - "publish-now": "Опубликовать сейчас", - "first-name": "Имя", - "last-name": "Фамилия", - "manage-pages": "Управление страницами", - "advanced-options": "Дополнительные опции", - "database-regenerated": "База данных регенерирована", - "html-markdown-code-supported": "Поддерживается код HTML и Markdown.", - "enable-more-features-at": "Включить больше возможностей на", - "settings-advanced-writting-settings": "Настройки->Дополнительно->Настройки написания", - "new-posts-and-pages-synchronized": "Новые записи и страницы синхронизированы.", - "you-can-choose-the-users-privilege": "Вы можете выбрать привилегию пользователя.Роль редактора позволяет только создание страниц и записей.", - "email-will-not-be-publicly-displayed": "E-mail не будет отображаться публично. Рекомендуется для восстановления пароля и уведомлений.", - "use-this-field-to-name-your-site": "Используйте это поле, чтобы назвать свой сайт, оно появится в верхней части каждой страницы вашего сайта.", - "use-this-field-to-add-a-catchy-prhase": "Используйте это поле, чтобы добавить броскую фразу на вашем сайте.", - "you-can-add-a-site-description-to-provide": "Вы можете добавить описание сайта, чтобы дать краткую биографию или описание вашего сайта.", - "you-can-add-a-small-text-on-the-bottom": "Вы можете добавить небольшой текст в нижней части каждой страницы. например: авторское право, владелец, дата, и т.д.", - "number-of-posts-to-show-per-page": "Количество записей, для показа на странице.", - "the-url-of-your-site": "URL вашего сайта.", - "add-or-edit-description-tags-or": "Добавить или редактировать описание, теги или изменить дружественный URL.", - "select-your-sites-language": "Выберите язык вашего сайта.", - "select-a-timezone-for-a-correct": "Выберите часовой пояс для правильного отображения даты/времени на вашем сайте.", - "you-can-use-this-field-to-define-a-set-of": "Вы можете использовать это поле, чтобы определить набор параметров, связанных с языком, страной и особых преференций.", - "email": "Email", - "email": "Email", - "email": "Email", - "email": "Email", - "email": "Email" + "username": "Логин", + "password": "Пароль", + "confirm-password": "Еще раз пароль", + "editor": "Редактор", + "dashboard": "Панель управления", + "role": "Роль", + "post": "Запись", + "posts": "Записи", + "users": "Пользователи", + "administrator": "Администратор", + "add": "Добавить", + "cancel": "Отмена", + "content": "Содержимое", + "title": "Заголовок", + "no-parent": "Нет родителя", + "edit-page": "Редактировать", + "edit-post": "Редактировать", + "add-a-new-user": "Добавить пользователя", + "parent": "Родитель", + "friendly-url": "Дружественные URL", + "description": "Описание", + "posted-by": "Автор", + "tags": "Теги", + "position": "Позиция", + "save": "Сохранить", + "draft": "Черновик", + "delete": "Удалить", + "registered": "Зарегистрирован", + "Notifications": "Уведомления", + "profile": "Профиль", + "email": "Email", + "settings": "Настройки", + "general": "Основные", + "advanced": "Дополнительные", + "regional": "Региональные", + "about": "О системе", + "login": "Вход", + "logout": "Выход", + "manage": "Управление", + "themes": "Темы", + "prev-page": "Предыдущая страница", + "next-page": "Следующая страница", + "configure-plugin": "Настроить", + "confirm-delete-this-action-cannot-be-undone": "Подтвердите удаление, это действие не обратимо.", + "site-title": "Заголовок", + "site-slogan": "Слоган", + "site-description": "Описание", + "footer-text": "Текст подвала", + "posts-per-page": "Записей на страницу", + "site-url": "URL сайта", + "writting-settings": "Настройки написания", + "url-filters": "URL фильтры", + "page": "Страница", + "pages": "Страницы", + "home": "Главная", + "welcome-back": "С возвращением", + "language": "Язык", + "website": "Сайт", + "timezone": "Часовой пояс", + "locale": "Локализация", + "new-post": "Добавить запись", + "html-and-markdown-code-supported": "Поддерживается код HTML и Markdown", + "new-page": "Добавить страницу", + "manage-posts": "Управление записями", + "published-date": "Дата публикации", + "modified-date": "Дата изменения", + "empty-title": "Пустой заголовок", + "plugins": "Плагины", + "install-plugin": "Установить", + "uninstall-plugin": "Удалить", + "new-password": "Новый пароль", + "edit-user": "Редактировать пользователя", + "publish-now": "Публиковать сейчас", + "first-name": "Имя", + "last-name": "Фамилия", + "bludit-version": "Версия Bludit", + "powered-by": "Работает на", + "recent-posts": "Последние записи", + "manage-pages": "Управление страницами", + "advanced-options": "Дополнительные опции", + "user-deleted": "Пользователь удален", + "page-added-successfully": "Страница успешно добавлена", + "post-added-successfully": "Запись успешно добавлена", + "the-post-has-been-deleted-successfully": "Запись успешно удалена", + "the-page-has-been-deleted-successfully": "Страница успешно удалена", + "username-or-password-incorrect": "Неверные логин или пароль", + "database-regenerated": "База данных регенерирована", + "the-changes-have-been-saved": "Изменения сохранены", + "enable-more-features-at": "Включить больше возможностей на", + "username-already-exists": "Имя пользователя уже занято", + "username-field-is-empty": "Поле логин пустое", + "the-password-and-confirmation-password-do-not-match":"Пароли не совпадают", + "user-has-been-added-successfully": "Пользователь успешно добавлен", + "you-do-not-have-sufficient-permissions": "У вас не достаточно прав для доступа к этой странице, обратитесь к администратору.", + "settings-advanced-writting-settings": "Настройки->Дополнительные->Настройки написания", + "new-posts-and-pages-synchronized": "Новые записи и страницы синхронизированы.", + "you-can-choose-the-users-privilege": "Вы можете выбрать привилегию пользователя. Роль редактора позволяет только создание страниц и записей.", + "email-will-not-be-publicly-displayed": "Email не будет отображаться публично. Рекомендуется для восстановления пароля и уведомлений.", + "use-this-field-to-name-your-site": "Используйте это поле, для названия вашего сайта, оно появится в верхней части каждой страницы сайта.", + "use-this-field-to-add-a-catchy-phrase": "Используйте это поле, чтобы добавить броскую фразу на вашем сайте.", + "you-can-add-a-site-description-to-provide": "Вы можете добавить краткое описание вашего сайта.", + "you-can-add-a-small-text-on-the-bottom": "Вы можете добавить небольшой текст в нижней части каждой страницы. Например: авторское право, имя владельца, даты и т.д.", + "number-of-posts-to-show-per-page": "Количество записей для отображения на странице.", + "the-url-of-your-site": "URL вашего сайта.", + "add-or-edit-description-tags-or": "Добавить или редактировать описание, теги или изменить дружественный URL.", + "select-your-sites-language": "Выберите язык вашего сайта.", + "select-a-timezone-for-a-correct": "Выберите часовой пояс для корректного отображения даты и времени на вашем сайте.", + "you-can-use-this-field-to-define-a-set-of": "Вы можете использовать это поле, чтобы определить набор параметров, связанных с языком, страной и особых предпочтений.", + "you-can-modify-the-url-which-identifies":"Вы можете изменить URL, который идентифицирует страницу или запись с помощью удобочитаемых ключевых слов. Не более 150 символов.", + "this-field-can-help-describe-the-content": "Это поле может помочь описать содержимое в нескольких словах. Не более 150 символов.", + "write-the-tags-separeted-by-comma": "Укажите теги через запятую. Например: тег1, тег2, тег3", + "delete-the-user-and-all-its-posts":"Удалить пользователя и все его записи", + "delete-the-user-and-associate-its-posts-to-admin-user": "Удалить пользователя и связать его записи с администратором", + "read-more": "Читать далее", + "show-blog": "Показать блог", + "default-home-page": "Домашняя страница по умолчанию", + "version": "Версия", + "there-are-no-drafts": "Черновиков нет", + "create-a-new-article-for-your-blog":"Создать новую запись для своего блога.", + "create-a-new-page-for-your-website":"Создать новую страницу на вашем сайте.", + "invite-a-friend-to-collaborate-on-your-website":"Пригласить друга сотрудничать на вашем сайте.", + "change-your-language-and-region-settings":"Изменить настройки языка и региона", + "language-and-timezone":"Язык и часовой пояс", + "author": "Автор", + "start-here": "Начните здесь", + "install-theme": "Установить", + "first-post": "Первая запись", + "congratulations-you-have-successfully-installed-your-bludit": "Поздравляем с успешной установкой **Bludit**", + "whats-next": "Что дальше", + "manage-your-bludit-from-the-admin-panel": "Управляйте Bludit из [панели управления](./admin/)", + "follow-bludit-on": "Следуйте за Bludit в", + "visit-the-support-forum": "Посетите [форум](http://forum.bludit.com) для получения поддержки", + "read-the-documentation-for-more-information": "Прочтите [документацию](http://docs.bludit.com) для получения большей информации", + "share-with-your-friends-and-enjoy": "Делитесь с друзьями и наслаждайтесь", + "the-page-has-not-been-found": "Страница не найдена.", + "error": "Ошибка", + "bludit-installer": "Установка Bludit", + "welcome-to-the-bludit-installer": "Добро пожаловать в установщик Bludit", + "complete-the-form-choose-a-password-for-the-username-admin": "Выберете пароль для пользователя « admin »", + "password-visible-field": "Пароль", + "install": "Установить", + "choose-your-language": "Выберете ваш язык", + "next": "Далее", + "the-password-field-is-empty": "Поле с паролем пустое", + "your-email-address-is-invalid":"Ваш email недействителен.", + "proceed-anyway": "Все равно продолжить!", + "drafts":"Черновики", + "ip-address-has-been-blocked": "IP адрес заблокирован.", + "try-again-in-a-few-minutes": "Попробуйте еще раз через несколько минут.", + "date": "Дата", + "you-can-schedule-the-post-just-select-the-date-and-time": "Вы можете запланировать запись, просто выберите дату и время.", + "scheduled": "Запланировано", + "publish": "Опубликовать", + "please-check-your-theme-configuration": "Пожалуйста, проверьте конфигурацию вашей темы.", + "plugin-label": "Метка плагина" } From a51cd01d593ca522a658f9bb6616abf0a5788c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=92=D0=BE=D1=80?= =?UTF-8?q?=D0=BE=D0=BD?= Date: Tue, 29 Sep 2015 12:29:16 +0700 Subject: [PATCH 12/29] Update ru_RU.json --- languages/ru_RU.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/ru_RU.json b/languages/ru_RU.json index 5c4b1609..7fa74d51 100644 --- a/languages/ru_RU.json +++ b/languages/ru_RU.json @@ -4,7 +4,7 @@ "native": "Русский (Россия)", "english-name": "Russian", "last-update": "2015-09-29", - "author": "Сергей ворон", + "author": "Сергей Ворон", "email": "sergey@voron.pw", "website": "voron.pw" }, From 38e77e58b5ef625a1c4c3b7e73bc9deb03064e26 Mon Sep 17 00:00:00 2001 From: cempal Date: Tue, 29 Sep 2015 20:39:39 +0800 Subject: [PATCH 13/29] Create id_ID.json --- languages/id_ID.json | 166 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 languages/id_ID.json diff --git a/languages/id_ID.json b/languages/id_ID.json new file mode 100644 index 00000000..8e515a6c --- /dev/null +++ b/languages/id_ID.json @@ -0,0 +1,166 @@ +{ + "language-data": + { + "native": "Bahasa Indonesia (Indonesia)", + "english-name": "Indonesian", + "last-update": "2015-09-29", + "author": "Cempal", + "email": "contact@cempal.com", + "website": "http://www.cempal.com" + }, + + "username": "Nama Pengguna", + "password": "Kata Sandi", + "confirm-password": "Ulangi Kata Sandi", + "editor": "Editor", + "dashboard": "Dasbor", + "role": "Peran", + "post": "Posting", + "posts": "Posting", + "users": "Pengguna", + "administrator": "Administrator", + "add": "Tambah", + "cancel": "Batal", + "content": "Isi", + "title": "Judul", + "no-parent": "Tanpa Induk", + "edit-page": "Sunting halaman", + "edit-post": "Sunting post", + "add-a-new-user": "Tambah pengguna baru", + "parent": "Induk", + "friendly-url": "Alamat URL Yang Ramah", + "description": "Penjelasan", + "posted-by": "Diterbitkan oleh", + "tags": "Label", + "position": "Posisi", + "save": "Simpan", + "draft": "Konsep", + "delete": "Hapus", + "registered": "Terdaftar", + "Notifications": "Pemberitahuan", + "profile": "Profil", + "email": "Surat elektronik", + "settings": "Pengaturan", + "general": "Umum", + "advanced": "Lanjutan", + "regional": "Wilayah", + "about": "Tentang", + "login": "Masuk", + "logout": "Keluar", + "manage": "Kelola", + "themes": "Tema", + "prev-page": "Halaman sebelumnya", + "next-page": "Halaman selanjutnya", + "configure-plugin": "Atur plugin", + "confirm-delete-this-action-cannot-be-undone": "Konfirmasi penghapusan, tindakan ini tidak dapat dibatalkan.", + "site-title": "Judul situs", + "site-slogan": "Slogan situs", + "site-description": "Deskripsi situs", + "footer-text": "Footer teks", + "posts-per-page": "Jumlah posting per halaman", + "site-url": "Alamat situs", + "writting-settings": "Pengaturan penulisan", + "url-filters": "Filter URL", + "page": "Halaman", + "pages": "Halaman", + "home": "Beranda", + "welcome-back": "Selamat Datang kembali", + "language": "Bahasa", + "website": "Website", + "timezone": "Zona waktu", + "locale": "Lokal", + "new-post": "Post baru", + "html-and-markdown-code-supported": "Mendukung HTML dan kode Markdown", + "new-page": "Halaman baru", + "manage-posts": "Kelola posting", + "published-date": "Tanggal diterbitkan", + "modified-date": "Tanggal modifikasi", + "empty-title": "Judul kosong", + "plugins": "Plugin", + "install-plugin": "Pasang plugin", + "uninstall-plugin": "Hapus plugin", + "new-password": "Kata kunci baru", + "edit-user": "Edit pengguna", + "publish-now": "Publikasi sekarang", + "first-name": "Nama depan", + "last-name": "Nama belakang", + "bludit-version": "Versi Bludit", + "powered-by": "Dipersembahkan oleh", + "recent-posts": "Posting Terbaru", + "manage-pages": "Kelola halaman", + "advanced-options": "Pilihan tingkat lanjut", + "user-deleted": "Pengguna dihapus", + "page-added-successfully": "Halaman telah ditambahkan", + "post-added-successfully": "Post telah ditambahkan", + "the-post-has-been-deleted-successfully": "Posting telah berhasil dihapus", + "the-page-has-been-deleted-successfully": "Halaman telah berhasil dihapus", + "username-or-password-incorrect": "Nama pengguna atau kata kunci tidak cocok", + "database-regenerated": "Database diregenerasi", + "the-changes-have-been-saved": "Perubahan telah disimpan", + "enable-more-features-at": "Memungkinkan lebih banyak fitur di", + "username-already-exists": "Nama pengguna sudah ada", + "username-field-is-empty": "Nama pengguna tidak diisi", + "the-password-and-confirmation-password-do-not-match":"Kata kunci dan konfirmasi kata kunci tidak sama", + "user-has-been-added-successfully": "Pengguna telah ditambahkan", + "you-do-not-have-sufficient-permissions": "Anda tidak memiliki izin yang memadai untuk mengakses halaman ini, hubungi administrator.", + "settings-advanced-writting-settings": "Pengaturan->Tingkat Lanjut->Pengaturan Penulisan", + "new-posts-and-pages-synchronized": "Post dan halaman baru telah disinkronisasi.", + "you-can-choose-the-users-privilege": "Anda dapat memilih hak pengguna. Peran Editor hanya bisa menulis halaman dan posting.", + "email-will-not-be-publicly-displayed": "Alamat surat elektronik tidak akan ditampilkan untuk umum. Direkomendasikan untuk pemulihan kata kunci dan pemberitahuan.", + "use-this-field-to-name-your-site": "Gunakan bidang ini untuk nama situs Anda, akan muncul di bagian atas setiap halaman situs Anda.", + "use-this-field-to-add-a-catchy-phrase": "Gunakan bidang ini untuk menambahkan frase menarik di situs Anda.", + "you-can-add-a-site-description-to-provide": "Anda dapat menambahkan deskripsi situs untuk memberikan informasi singkat mengenai situs Anda.", + "you-can-add-a-small-text-on-the-bottom": "Anda dapat menambahkan teks di bagian bawah setiap halaman. misalnya: hak cipta, pemilik, tanggal, dll.", + "number-of-posts-to-show-per-page": "Jumlah posting untuk ditampilkan per halaman.", + "the-url-of-your-site": "Alamat URL dari situs Anda.", + "add-or-edit-description-tags-or": "Tambahkan atau ubah deskripsi, label, atau ubah alamat URL.", + "select-your-sites-language": "Pilih bahasa bagi situs Anda.", + "select-a-timezone-for-a-correct": "Pilih zona waktu bagi situs Anda.", + "you-can-use-this-field-to-define-a-set-of": "Anda dapat menggunakan bidang ini untuk mendefinisikan satu set parameter yang terkait dengan bahasa, negara dan preferensi khusus.", + "you-can-modify-the-url-which-identifies":"Anda dapat memodifikasi URL yang mengidentifikasi halaman atau posting menggunakan kata kunci yang mudah dipahami manusia. Tidak lebih dari 150 karakter.", + "this-field-can-help-describe-the-content": "Bidang ini untuk membantu menjelaskan isi dalam beberapa kata. Tidak lebih dari 150 karakter.", + "write-the-tags-separeted-by-comma": "Tulis label yang dipisahkan oleh tanda koma. Contohnya: label1, label2, label3", + "delete-the-user-and-all-its-posts":"Hapus pengguna dan semua postingnya", + "delete-the-user-and-associate-its-posts-to-admin-user": "Hapus pengguna dan hibahkan postingnya kepada pengguna dengan tingkatan admin", + "read-more": "Baca seterusnya", + "show-blog": "Tampilkan blog", + "default-home-page": "Beranda default", + "version": "Versi", + "there-are-no-drafts": "Tidak ada draft.", + "create-a-new-article-for-your-blog":"Buat artikel baru untuk blog Anda.", + "create-a-new-page-for-your-website":"Membuat halaman baru untuk situs web Anda.", + "invite-a-friend-to-collaborate-on-your-website":"Undang teman untuk berkolaborasi pada situs Anda.", + "change-your-language-and-region-settings":"Ubah pengaturan bahasa dan wilayah Anda.", + "language-and-timezone":"Bahasa dan zona waktu", + "author": "Penulis", + "start-here": "Mulai dari sini", + "install-theme": "Pasang tema", + "first-post": "Posting pertama", + "congratulations-you-have-successfully-installed-your-bludit": "Selamat Anda telah berhasil menginstal **Bludit**", + "whats-next": "Apa Berikutnya", + "manage-your-bludit-from-the-admin-panel": "Kelola Bludit Anda dari [admin area](./admin/)", + "follow-bludit-on": "Ikuti Bludit di", + "visit-the-support-forum": "Kunjungi [forum](http://forum.bludit.com) untuk bantuan", + "read-the-documentation-for-more-information": "Baca [documentation](http://docs.bludit.com) untuk informasi lebih lanjut", + "share-with-your-friends-and-enjoy": "Berbagi dengan teman Anda dan selamat menikmati", + "the-page-has-not-been-found": "Halaman tidak ditemukan.", + "error": "Kesalahan", + "bludit-installer": "Bantuan Pemasangan Bludit", + "welcome-to-the-bludit-installer": "Selamat Datang pada Bantuan Pemasangan Bludit", + "complete-the-form-choose-a-password-for-the-username-admin": "Lengkapi formulir, pilih kata kunci untuk pengguna « admin »", + "password-visible-field": "Kata kunci, bidang yang terlihat!", + "install": "Pasang", + "choose-your-language": "Pilih bahasa Anda", + "next": "Berikutnya", + "the-password-field-is-empty": "Kata kunci tidak diisi", + "your-email-address-is-invalid":"Alamat surat elektronik tidak benar.", + "proceed-anyway": "Tetap lanjutkan!", + "drafts":"Draft", + "ip-address-has-been-blocked": "Alamat IP diblokir.", + "try-again-in-a-few-minutes": "Coba lagi dalam beberapa menit.", + "date": "Tanggal", + "you-can-schedule-the-post-just-select-the-date-and-time": "Anda dapat menjadwalkan posting, cukup pilih tanggal dan waktu.", + "scheduled": "Telah dijadwalkan", + "publish": "Terbitkan", + "please-check-your-theme-configuration": "Silahkan periksa pengaturan tema Anda." +} From 61b1f50a7449e37a04eb0339d37902a12a9599e1 Mon Sep 17 00:00:00 2001 From: dignajar Date: Tue, 29 Sep 2015 22:33:55 -0300 Subject: [PATCH 14/29] Cli mode feature --- admin/views/settings.php | 15 +++++++++++++++ languages/en_US.json | 7 ++++++- plugins/opengraph/languages/en_US.json | 7 ++++++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/admin/views/settings.php b/admin/views/settings.php index 96200c2a..fc7a0546 100644 --- a/admin/views/settings.php +++ b/admin/views/settings.php @@ -87,6 +87,21 @@
p('the-url-of-your-site') ?>
+

p('Command Line Mode') ?>

+ + +

p('URL Filters') ?>