beber pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=838b4b3e069e862a246445d7037074bfa1fd119d
commit 838b4b3e069e862a246445d7037074bfa1fd119d
Author: Bertrand Jacquin <bertr...@jacquin.bzh>
Date: Sun Oct 15 04:52:26 2017 +0100
MEDIUM: Update plugin discussion to v2017-08-24
---
public_html/lib/plugins/discussion/action.php | 184 ++++++++++++++-------
.../lib/plugins/discussion/conf/default.php | 2 +-
.../lib/plugins/discussion/conf/metadata.php | 2 +-
public_html/lib/plugins/discussion/helper.php | 16 +-
.../lib/plugins/discussion/images/updated.gif | Bin 0 -> 118 bytes
.../lib/plugins/discussion/lang/ar/settings.php | 1 -
.../discussion/lang/bg/confirmsubscribe.txt | 10 ++
.../lib/plugins/discussion/lang/bg/lang.php | 40 +++++
.../lib/plugins/discussion/lang/bg/settings.php | 27 +++
.../plugins/discussion/lang/bg/subscribermail.txt | 19 +++
.../lib/plugins/discussion/lang/cs/settings.php | 3 +-
.../lib/plugins/discussion/lang/da/lang.php | 4 +-
.../lib/plugins/discussion/lang/da/settings.php | 5 +-
.../discussion/lang/de-informal/settings.php | 1 -
.../lib/plugins/discussion/lang/de/lang.php | 8 +-
.../lib/plugins/discussion/lang/de/settings.php | 6 +-
.../lib/plugins/discussion/lang/el/settings.php | 1 -
.../lib/plugins/discussion/lang/en/settings.php | 2 +-
.../discussion/lang/eo/confirmsubscribe.txt | 5 +-
.../lib/plugins/discussion/lang/eo/lang.php | 4 +-
.../lib/plugins/discussion/lang/eo/settings.php | 13 +-
.../plugins/discussion/lang/eo/subscribermail.txt | 6 +-
.../lib/plugins/discussion/lang/es/settings.php | 1 -
.../discussion/lang/fa/confirmsubscribe.txt | 9 +
.../lib/plugins/discussion/lang/fa/lang.php | 40 +++++
.../lib/plugins/discussion/lang/fa/settings.php | 29 ++++
.../plugins/discussion/lang/fa/subscribermail.txt | 18 ++
.../lib/plugins/discussion/lang/fi/settings.php | 1 -
.../discussion/lang/fr/confirmsubscribe.txt | 4 +-
.../lib/plugins/discussion/lang/fr/lang.php | 3 +-
.../lib/plugins/discussion/lang/fr/settings.php | 11 +-
.../plugins/discussion/lang/fr/subscribermail.txt | 4 +-
.../lib/plugins/discussion/lang/hr/settings.php | 2 +-
.../lib/plugins/discussion/lang/hu/settings.php | 1 -
.../discussion/lang/it/confirmsubscribe.txt | 10 ++
.../lib/plugins/discussion/lang/it/lang.php | 80 +++++----
.../lib/plugins/discussion/lang/it/settings.php | 50 +++---
.../plugins/discussion/lang/it/subscribermail.txt | 4 +-
.../lib/plugins/discussion/lang/ja/lang.php | 5 +-
.../lib/plugins/discussion/lang/ja/settings.php | 7 +-
.../discussion/lang/ko/confirmsubscribe.txt | 2 +-
.../lib/plugins/discussion/lang/ko/lang.php | 26 +--
.../lib/plugins/discussion/lang/ko/settings.php | 28 ++--
.../plugins/discussion/lang/ko/subscribermail.txt | 4 +-
.../lib/plugins/discussion/lang/nl/settings.php | 3 +-
.../discussion/lang/no/confirmsubscribe.txt | 9 +
.../lib/plugins/discussion/lang/no/lang.php | 41 +++++
.../lib/plugins/discussion/lang/no/settings.php | 30 ++++
.../plugins/discussion/lang/no/subscribermail.txt | 18 ++
.../lib/plugins/discussion/lang/pt-br/lang.php | 4 +-
.../lib/plugins/discussion/lang/pt-br/settings.php | 4 +-
.../lib/plugins/discussion/lang/ru/settings.php | 3 +-
.../plugins/discussion/lang/{sl-si => sl}/lang.php | 0
.../discussion/lang/sv/confirmsubscribe.txt | 10 ++
.../lib/plugins/discussion/lang/sv/lang.php | 84 +++++-----
.../lib/plugins/discussion/lang/sv/settings.php | 29 ++++
.../plugins/discussion/lang/sv/subscribermail.txt | 19 +++
.../lib/plugins/discussion/lang/tr/lang.php | 51 ++++++
.../lib/plugins/discussion/lang/zh-tw/settings.php | 1 -
.../lib/plugins/discussion/lang/zh/lang.php | 82 +++++----
.../lib/plugins/discussion/lang/zh/settings.php | 56 +++----
public_html/lib/plugins/discussion/plugin.info.txt | 4 +-
public_html/lib/plugins/discussion/script.js | 3 +-
public_html/lib/plugins/discussion/style.css | 6 +
.../lib/plugins/discussion/syntax/comments.php | 2 +-
65 files changed, 816 insertions(+), 341 deletions(-)
diff --git a/public_html/lib/plugins/discussion/action.php
b/public_html/lib/plugins/discussion/action.php
index 0cb892c7..99b64342 100644
--- a/public_html/lib/plugins/discussion/action.php
+++ b/public_html/lib/plugins/discussion/action.php
@@ -51,7 +51,14 @@ class action_plugin_discussion extends
DokuWiki_Action_Plugin{
'AFTER',
$this,
'idx_add_discussion',
- array()
+ array('id' => 'page', 'text' => 'body')
+ );
+ $contr->register_hook(
+ 'FULLTEXT_SNIPPET_CREATE',
+ 'BEFORE',
+ $this,
+ 'idx_add_discussion',
+ array('id' => 'id', 'text' => 'text')
);
$contr->register_hook(
'INDEXER_VERSION_GET',
@@ -61,6 +68,13 @@ class action_plugin_discussion extends
DokuWiki_Action_Plugin{
array()
);
$contr->register_hook(
+ 'FULLTEXT_PHRASE_MATCH',
+ 'AFTER',
+ $this,
+ 'ft_phrase_match',
+ array()
+ );
+ $contr->register_hook(
'PARSER_METADATA_RENDER',
'AFTER',
$this,
@@ -210,12 +224,8 @@ class action_plugin_discussion extends
DokuWiki_Action_Plugin{
// enable captchas
if (in_array($_REQUEST['comment'], array('add', 'save'))) {
- if (@file_exists(DOKU_PLUGIN.'captcha/action.php')) {
- $this->_captchaCheck();
- }
- if (@file_exists(DOKU_PLUGIN.'recaptcha/action.php')) {
- $this->_recaptchaCheck();
- }
+ $this->_captchaCheck();
+ $this->_recaptchaCheck();
}
// if we are not in show mode or someone wants to unsubscribe, that
was all for now
@@ -815,10 +825,10 @@ class action_plugin_discussion extends
DokuWiki_Action_Plugin{
$head .= '</span>, '.
'<abbr class="published" title="'. strftime('%Y-%m-%dT%H:%M:%SZ',
$created) .'">'.
dformat($created, $conf['dformat']).'</abbr>';
- if ($comment['edited']) {
- $head .= ' (<abbr class="updated" title="'.
+ if ($modified) {
+ $head .= ', <abbr class="updated" title="'.
strftime('%Y-%m-%dT%H:%M:%SZ',
$modified).'">'.dformat($modified, $conf['dformat']).
- '</abbr>)';
+ '</abbr>';
}
ptln($head, 8);
ptln('</div>', 6); // class="comment_head"
@@ -1041,10 +1051,21 @@ class action_plugin_discussion extends
DokuWiki_Action_Plugin{
}
?></textarea>
</div>
- <?php //bad and dirty event insert hook
- $evdata = array('writable' => true);
- trigger_event('HTML_EDITFORM_INJECTION', $evdata);
- ?>
+
+ <?php
+ /** @var helper_plugin_captcha $captcha */
+ $captcha = $this->loadHelper('captcha', false);
+ if ($captcha && $captcha->isEnabled()) {
+ echo $captcha->getHTML();
+ }
+
+ /** @var helper_plugin_recaptcha $recaptcha */
+ $recaptcha = $this->loadHelper('recaptcha', false);
+ if ($recaptcha && $recaptcha->isEnabled()) {
+ echo $recaptcha->getHTML();
+ }
+ ?>
+
<input class="button comment_submit" id="discussion__btn_submit"
type="submit" name="submit" accesskey="s" value="<?php echo $lang['btn_save']
?>" title="<?php echo $lang['btn_save']?> [S]" tabindex="7" />
<input class="button comment_preview_button"
id="discussion__btn_preview" type="button" name="preview" accesskey="p"
value="<?php echo $lang['btn_preview'] ?>" title="<?php echo
$lang['btn_preview']?> [P]" />
@@ -1063,48 +1084,6 @@ class action_plugin_discussion extends
DokuWiki_Action_Plugin{
</form>
</div>
<?php
- if ($this->getConf('usecocomment')){
- $this->_coComment();
- }
- }
-
- /**
- * Adds a javascript to interact with coComments
- */
- protected function _coComment() {
- global $ID;
- global $conf;
- global $INFO;
-
- $user = $_SERVER['REMOTE_USER'];
-
- ?>
- <script type="text/javascript"><!--//--><![CDATA[//><!--
- var blogTool = "DokuWiki";
- var blogURL = "<?php echo DOKU_URL ?>";
- var blogTitle = "<?php echo $conf['title'] ?>";
- var postURL = "<?php echo wl($ID, '', true) ?>";
- var postTitle = "<?php echo tpl_pagetitle($ID, true) ?>";
- <?php
- if ($user) {
- ?>
- var commentAuthor = "<?php echo $INFO['userinfo']['name'] ?>";
- <?php
- } else {
- ?>
- var commentAuthorFieldName = "name";
- <?php
- }
- ?>
- var commentAuthorLoggedIn = <?php echo ($user ? 'true' : 'false') ?>;
- var commentFormID = "discussion__comment_form";
- var commentTextFieldName = "text";
- var commentButtonName = "submit";
- var cocomment_force = false;
- //--><!]]></script>
- <script type="text/javascript"
src="http://www.cocomment.com/js/cocomment.js";>
- </script>
- <?php
}
/**
@@ -1294,7 +1273,42 @@ class action_plugin_discussion extends
DokuWiki_Action_Plugin{
$mailer->bcc($conf['notify']);
$mailer->send();
}
-
+
+ // send email to moderators
+ if ($this->getConf('moderatorsnotify')) {
+ $mods = trim($this->getConf('moderatorgroups'));
+ if (!empty($mods)) {
+ global $auth;
+ // create a clean mods list
+ $mods = explode(',', $mods);
+ $mods = array_map('trim', $mods);
+ $mods = array_unique($mods);
+ $mods = array_filter($mods);
+ // search for moderators users
+ foreach($mods as $mod) {
+ if(!$auth->isCaseSensitive()) $mod = utf8_strtolower($mod);
+ // create a clean mailing list
+ $dests = array();
+ if($mod[0] == '@') {
+ foreach($auth->retrieveUsers(0, 0, array('grps' =>
$auth->cleanGroup(substr($mod, 1)))) as $user) {
+ if (!empty($user['mail'])) {
+ array_push($dests, $user['mail']);
+ }
+ }
+ } else {
+ $userdata = $auth->getUserData($auth->cleanUser($mod));
+ if (!empty($userdata['mail'])) {
+ array_push($dests, $userdata['mail']);
+ }
+ }
+ $dests = array_unique($dests);
+ // notify the users
+ $mailer->bcc(implode(',', $dests));
+ $mailer->send();
+ }
+ }
+ }
+
// notify page subscribers
if (actionOK('subscribe')) {
$data = array('id' => $ID, 'addresslist' => '', 'self' => false);
@@ -1386,7 +1400,10 @@ class action_plugin_discussion extends
DokuWiki_Action_Plugin{
*/
protected function _render($raw) {
if ($this->getConf('wikisyntaxok')) {
- $xhtml = $this->render($raw);
+ // Note the warning for render_text:
+ // "very ineffecient for small pieces of data - try not to use"
+ // in dokuwiki/inc/plugin.php
+ $xhtml = $this->render_text($raw);
} else { // wiki syntax not allowed -> just encode special chars
$xhtml = hsc(trim($raw));
$xhtml = str_replace("\n", '<br />', $xhtml);
@@ -1578,18 +1595,65 @@ class action_plugin_discussion extends
DokuWiki_Action_Plugin{
public function idx_add_discussion(Doku_Event $event, $param) {
// get .comments meta file name
- $file = metaFN($event->data['page'], '.comments');
+ $file = metaFN($event->data[$param['id']], '.comments');
+
+ if (!@file_exists($file)) return;
+ $data = unserialize(io_readFile($file, false));
+ if ((!$data['status']) || ($data['number'] == 0)) return; // comments
are turned off
+
+ // now add the comments
+ if (isset($data['comments'])) {
+ foreach ($data['comments'] as $key => $value) {
+ $event->data[$param['text']] .=
DOKU_LF.$this->_addCommentWords($key, $data);
+ }
+ }
+ }
+
+ function ft_phrase_match(Doku_Event $event, $param) {
+ if ($event->result === true) return;
+
+ // get .comments meta file name
+ $file = metaFN($event->data['id'], '.comments');
if (!@file_exists($file)) return;
$data = unserialize(io_readFile($file, false));
if ((!$data['status']) || ($data['number'] == 0)) return; // comments
are turned off
+ $matched = false;
+
// now add the comments
if (isset($data['comments'])) {
foreach ($data['comments'] as $key => $value) {
- $event->data['body'] .= $this->_addCommentWords($key, $data);
+ $matched = $this->comment_phrase_match($event->data['phrase'],
$key, $data);
+ if ($matched) break;
+ }
+ }
+
+ if ($matched)
+ $event->result = true;
+ }
+
+ function comment_phrase_match($phrase, $cid, &$data, $parent = '') {
+ if (!isset($data['comments'][$cid])) return false; // comment was
removed
+ $comment = $data['comments'][$cid];
+
+ if (!is_array($comment)) return false; // corrupt datatype
+ if ($comment['parent'] != $parent) return false; // reply to an
other comment
+ if (!$comment['show']) return false; // hidden comment
+
+ $text = utf8_strtolower($comment['raw']);
+ if (strpos($text, $phrase) !== false) {
+ return true;
+ }
+
+ if (is_array($comment['replies'])) { // and the replies
+ foreach ($comment['replies'] as $rid) {
+ if ($this->comment_phrase_match($phrase, $rid, $data, $cid)) {
+ return true;
+ }
}
}
+ return false;
}
/**
diff --git a/public_html/lib/plugins/discussion/conf/default.php
b/public_html/lib/plugins/discussion/conf/default.php
index 2ddc4e09..eea6ef15 100644
--- a/public_html/lib/plugins/discussion/conf/default.php
+++ b/public_html/lib/plugins/discussion/conf/default.php
@@ -12,7 +12,6 @@ $conf['useavatar'] = 1; // use Avatar Plugin to display
user images in comm
$conf['urlfield'] = 0; // allow entering an URL
$conf['addressfield'] = 0; // allow entering an address
$conf['adminimport'] = 0; // allow admins to set all the fields for import
-$conf['usecocomment'] = 0; // use coComment comment tracking
$conf['wikisyntaxok'] = 1; // allow wiki syntax in comments
$conf['subscribe'] = 1; // enable/disable subscribe to comments
$conf['newestfirst'] = 0; // list newest comments first
@@ -22,5 +21,6 @@ $conf['userealname'] = 1;
$conf['threads_formposition'] = 'bottom'; // position of new thread form
$conf['visibilityButton'] = 0; // show/hide button to hide the discussion
section
$conf['moderatorgroups'] = '';
+$conf['moderatorsnotify'] = 0;
//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/public_html/lib/plugins/discussion/conf/metadata.php
b/public_html/lib/plugins/discussion/conf/metadata.php
index 38092281..8080982e 100644
--- a/public_html/lib/plugins/discussion/conf/metadata.php
+++ b/public_html/lib/plugins/discussion/conf/metadata.php
@@ -15,7 +15,6 @@ $meta['useavatar'] = array('onoff');
$meta['urlfield'] = array('onoff');
$meta['addressfield'] = array('onoff');
$meta['adminimport'] = array('onoff');
-$meta['usecocomment'] = array('onoff');
$meta['wikisyntaxok'] = array('onoff');
$meta['subscribe'] = array('onoff');
$meta['newestfirst'] = array('onoff');
@@ -28,5 +27,6 @@ $meta['threads_formposition'] = array(
);
$meta['visibilityButton'] = array('onoff');
$meta['moderatorgroups'] = array('string');
+$meta['moderatorsnotify'] = array('onoff');
//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/public_html/lib/plugins/discussion/helper.php
b/public_html/lib/plugins/discussion/helper.php
index d65fea99..17ccf4a3 100644
--- a/public_html/lib/plugins/discussion/helper.php
+++ b/public_html/lib/plugins/discussion/helper.php
@@ -102,7 +102,7 @@ class helper_plugin_discussion extends DokuWiki_Plugin {
require_once(DOKU_INC.'inc/search.php');
- $dir = utf8_encodeFN($conf['datadir'].($ns ? '/'.str_replace(':', '/',
$ns): ''));
+ $dir = $conf['datadir'].utf8_encodeFN(($ns ? '/'.str_replace(':', '/',
$ns): ''));
// returns the list of pages in the given namespace and it's subspaces
$items = array();
@@ -254,8 +254,18 @@ class helper_plugin_discussion extends DokuWiki_Plugin {
// check if discussion is turned off
if ($data['status'] === 0) return false;
- // check if the comment still exists
- if (!isset($data['comments'][$cid])) return false;
+ $parent_id = $cid;
+ // Check for the comment and all parents if they exist and are visible.
+ do {
+ $tcid = $parent_id;
+
+ // check if the comment still exists
+ if (!isset($data['comments'][$tcid])) return false;
+ // check if the comment is visible
+ if ($data['comments'][$tcid]['show'] != 1) return false;
+
+ $parent_id = $data['comments'][$tcid]['parent'];
+ } while ($parent_id && $parent_id != $tcid);
// okay, then add some additional info
if (is_array($data['comments'][$cid]['user'])) {
diff --git a/public_html/lib/plugins/discussion/images/updated.gif
b/public_html/lib/plugins/discussion/images/updated.gif
new file mode 100644
index 00000000..a95ba7bd
Binary files /dev/null and
b/public_html/lib/plugins/discussion/images/updated.gif differ
diff --git a/public_html/lib/plugins/discussion/lang/ar/settings.php
b/public_html/lib/plugins/discussion/lang/ar/settings.php
index 0b4a7c2d..17339032 100644
--- a/public_html/lib/plugins/discussion/lang/ar/settings.php
+++ b/public_html/lib/plugins/discussion/lang/ar/settings.php
@@ -17,7 +17,6 @@ $lang['gravatar_rating'] = 'أصغر معدّل لصورة المستخدم';
$lang['urlfield'] = 'السماح للمستخدكين بإدخال رابط الويب';
$lang['addressfield'] = 'السماح للمستخدمين بإدخال العنوان البريدي';
$lang['adminimport'] = 'السماح للمشرفين بوضع كل الحقول للتصدير';
-$lang['usecocomment'] = 'إرسال نسخة من التعليقات';
$lang['wikisyntaxok'] = 'السماح بصيغ ويكي في التعليقات';
$lang['threads_formposition'] = 'مكان توضع الفقرة الجديدة';
diff --git a/public_html/lib/plugins/discussion/lang/bg/confirmsubscribe.txt
b/public_html/lib/plugins/discussion/lang/bg/confirmsubscribe.txt
new file mode 100644
index 00000000..8f8251a6
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/bg/confirmsubscribe.txt
@@ -0,0 +1,10 @@
+Здравейте!
+
+Заявили сте желание да се абонирате за коментарите на страницата @PAGE@ в
wiki-то на @TITLE@.
+
+За да се абонирате кликнете върху следния линк:
+@SUBSCRIBE@
+
+--
+Писмото е генерирано от DokuWiki на адрес
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/public_html/lib/plugins/discussion/lang/bg/lang.php
b/public_html/lib/plugins/discussion/lang/bg/lang.php
new file mode 100644
index 00000000..871a871c
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/bg/lang.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ * @author Kiril <neohi...@gmail.com>
+ */
+$lang['encoding'] = 'utf-8';
+$lang['direction'] = 'От ляво надясно';
+$lang['menu'] = 'Модерирана дискусия';
+$lang['discussion'] = 'Дискусия';
+$lang['comment'] = 'Коментар';
+$lang['comments'] = 'Коментари';
+$lang['nocomments'] = 'Коментари';
+$lang['threads'] = 'Дискусии';
+$lang['url'] = 'Уеб сайт';
+$lang['address'] = 'Адрес';
+$lang['date'] = 'Дата';
+$lang['entercomment'] = 'Въведете вашия комента';
+$lang['wikisyntax'] = 'Може да ползвате Wiki синтаксис';
+$lang['older'] = 'По-стари';
+$lang['newer'] = 'По-нови';
+$lang['btn_reply'] = 'Отговор';
+$lang['btn_hide'] = 'Скрий';
+$lang['btn_show'] = 'Покажи';
+$lang['btn_change'] = 'Промени';
+$lang['statuschanged'] = 'Променено състояние а дискусия';
+$lang['wordblock'] = 'Коментарът ви е класифициран като SPAM и е
блокиран.';
+$lang['moderation'] = 'Коментарът ви е добавен към списъка за
одобрение от модератор.';
+$lang['mail_newcomment'] = 'Нов коментар';
+$lang['subscribe'] = 'Абониране за коментарите';
+$lang['noguests'] = 'Можете да коментирате само ако се впишете.';
+$lang['status'] = 'Състояение';
+$lang['off'] = 'изключено';
+$lang['open'] = 'отворена';
+$lang['closed'] = 'затворена';
+$lang['reply'] = 'Отговор';
+$lang['replies'] = 'Отговори';
+$lang['newthread'] = 'Нова дискусионна страница';
+$lang['toggle_display'] = 'Скрий/Покажи';
diff --git a/public_html/lib/plugins/discussion/lang/bg/settings.php
b/public_html/lib/plugins/discussion/lang/bg/settings.php
new file mode 100644
index 00000000..1b9b0ec4
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/bg/settings.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ * @author Kiril <neohi...@gmail.com>
+ */
+$lang['automatic'] = 'Поставяне на дискусионна секция на всяка
страница';
+$lang['excluded_ns'] = 'Списък от именни пространства, за които
горната опция да не важи (регулярен израз, напр.
<code>/(playground|wiki)/</code> )';
+$lang['allowguests'] = 'Разрешаване на нерегистрирани потребители да
коментират';
+$lang['showguests'] = 'Разрешаване на гости да четът коментиратите';
+$lang['useavatar'] = 'Показване на аватарите на потребителите в
коментарите';
+$lang['urlfield'] = 'Разрешаване на потребители да въвеждат URL
адреси';
+$lang['addressfield'] = 'Разрешаване на потребители да въвеждат
пощенски кодове';
+$lang['adminimport'] = 'Разрешаване на администраторите да определят
всичко полета като важни';
+$lang['wikisyntaxok'] = 'Разрешаване Wiki синтаксис в коментарите';
+$lang['subscribe'] = 'Разрешаване абонирането за коментарите';
+$lang['newestfirst'] = 'Показване първо на най-новите коментари';
+$lang['moderate'] = 'Модериране на новите коментари';
+$lang['userealname'] = 'Показване на истинското име вместо
потребителското име за регистрирани потребители';
+$lang['threads_formposition'] = 'Позиция на която да се вмъква формата
<code>{{threads> }}</code> за нова дискусия в страниците';
+$lang['threads_formposition_o_off'] = 'изключено';
+$lang['threads_formposition_o_top'] = 'отгоре';
+$lang['threads_formposition_o_bottom'] = 'отдолу';
+$lang['visibilityButton'] = 'Бутон за показване / скриване на секцията за
дискусии';
+$lang['moderatorgroups'] = 'Списък на модератори, разделени със запетая
(равнява се на ниво на достъп DokuWiki-Manager)';
+$lang['moderatorsnotify'] = 'Изпращане на имейл при нов коментар до
модераторите';
diff --git a/public_html/lib/plugins/discussion/lang/bg/subscribermail.txt
b/public_html/lib/plugins/discussion/lang/bg/subscribermail.txt
new file mode 100644
index 00000000..ccdcd1a6
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/bg/subscribermail.txt
@@ -0,0 +1,19 @@
+Здравейте!
+
+Към страницата @PAGE@ е добавен нов коментар, в wiki-то на @TITLE@.
+
+Дата: @DATE@
+Име: @NAME@
+URL: @COMMENTURL@
+
+Коментар:
+--------------------------------------------------------
+@TEXT@
+--------------------------------------------------------
+
+За да се отпишете кликнете върху следния линк:
+@UNSUBSCRIBE@
+
+--
+Писмото е генерирано от DokuWiki на адрес
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/public_html/lib/plugins/discussion/lang/cs/settings.php
b/public_html/lib/plugins/discussion/lang/cs/settings.php
index 051f9316..be56d6c7 100644
--- a/public_html/lib/plugins/discussion/lang/cs/settings.php
+++ b/public_html/lib/plugins/discussion/lang/cs/settings.php
@@ -5,6 +5,7 @@
*
* @author Lukas Zapletal <lukas.zapletal at gmail dot com>
* @author Jaroslav Lichtblau <jlichtb...@seznam.cz>
+ * @author Turkislav <b...@bla.bla>
*/
$lang['automatic'] = 'diskuzní sekci na každou stránku jako
výchozí';
$lang['excluded_ns'] = 'seznam jmenných prostorů pro obrácení
možnosti výše (regulární výraz např. <code>/(playground|wiki)/</code> )';
@@ -15,7 +16,6 @@ $lang['useavatar'] = 'použit avatar obrázky';
$lang['urlfield'] = 'povolit uživatelům vložit URL';
$lang['addressfield'] = 'povolit uživatelům vložit poštovní adresu';
$lang['adminimport'] = 'povolit administrátorům nastavit všechna
pole pro import';
-$lang['usecocomment'] = 'použít sledování komentářů coComment';
$lang['wikisyntaxok'] = 'povolit wiki syntax v komentářích';
$lang['subscribe'] = 'povolit/zakázat odběr komentářů';
$lang['newestfirst'] = 'vypisovat nejdříve nejnovější komentáře';
@@ -23,3 +23,4 @@ $lang['moderate'] = 'moderovat nové komentáře';
$lang['usethreading'] = 'povolit vlákna komentářů';
$lang['userealname'] = 'zobrazit celé jméno místo uživatelského
jména pro registrované uživatele wiki';
$lang['visibilityButton'] = 'Povolit tlačítko pro přepínání viditelnosti
diskuzní sekce';
+$lang['moderatorsnotify'] = 'Upozorňovat emailem moderátory na nové
komentáře';
diff --git a/public_html/lib/plugins/discussion/lang/da/lang.php
b/public_html/lib/plugins/discussion/lang/da/lang.php
index e2cb6935..b72df673 100644
--- a/public_html/lib/plugins/discussion/lang/da/lang.php
+++ b/public_html/lib/plugins/discussion/lang/da/lang.php
@@ -2,10 +2,11 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ *
* @author Esther Brunner <wikides...@gmail.com>
* @author iDo <ilove...@gmail.com>
* @author Jens Hyllegaard <jens.hyllega...@gmail.com>
+ * @author Jacob Palm <m...@jacobpalm.dk>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -14,6 +15,7 @@ $lang['discussion'] = 'Diskussion';
$lang['comment'] = 'Kommentar';
$lang['comments'] = 'Kommentarer';
$lang['nocomments'] = 'Kommentarer';
+$lang['threads'] = 'Diskussioner';
$lang['url'] = 'Hjemmeside';
$lang['address'] = 'Adresse';
$lang['date'] = 'Dato';
diff --git a/public_html/lib/plugins/discussion/lang/da/settings.php
b/public_html/lib/plugins/discussion/lang/da/settings.php
index dd9859ed..145c39ed 100644
--- a/public_html/lib/plugins/discussion/lang/da/settings.php
+++ b/public_html/lib/plugins/discussion/lang/da/settings.php
@@ -2,9 +2,10 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ *
* @author Esther Brunner <wikides...@gmail.com>
* @author Jens Hyllegaard <jens.hyllega...@gmail.com>
+ * @author Jacob Palm <m...@jacobpalm.dk>
*/
$lang['automatic'] = 'diskussion på alle sider som standard';
$lang['allowguests'] = 'tillad kommentarer fra anonyme brugere';
@@ -14,7 +15,6 @@ $lang['useavatar'] = 'brug brugerikoner som
billed til kommentarer';
$lang['urlfield'] = 'tillad brugere at indtaste et link til en
hjemmeside';
$lang['addressfield'] = 'tillad brugere at indtaste adresser';
$lang['adminimport'] = 'tillad administratorer at sætte alle felter
til import';
-$lang['usecocomment'] = 'brug coComment til at følge kommentarer';
$lang['wikisyntaxok'] = 'tillad wiki syntax i kommentarer';
$lang['subscribe'] = 'Aktiver mulighed for at tilmelde sig
kommentarer';
$lang['newestfirst'] = 'skriv nyeste kommentarer først';
@@ -27,3 +27,4 @@ $lang['threads_formposition_o_top'] = 'top';
$lang['threads_formposition_o_bottom'] = 'bund';
$lang['visibilityButton'] = 'Aktiver knap til at skifte synligheden for
diskussionssektionen';
$lang['moderatorgroups'] = 'Komma-separeret liste over moderatorgrupper
(svarer til DokuWiki manager rettighedsniveau)';
+$lang['moderatorsnotify'] = 'Send e-mail notifikationer omkring nye
kommentarer til moderatorer';
diff --git a/public_html/lib/plugins/discussion/lang/de-informal/settings.php
b/public_html/lib/plugins/discussion/lang/de-informal/settings.php
index d5dc461f..65c1cf17 100644
--- a/public_html/lib/plugins/discussion/lang/de-informal/settings.php
+++ b/public_html/lib/plugins/discussion/lang/de-informal/settings.php
@@ -14,7 +14,6 @@ $lang['useavatar'] = 'Avatar in Kommentaren verwenden';
$lang['urlfield'] = 'Eingabefeld für URL anbieten';
$lang['addressfield'] = 'Eingabefeld für Adresse anbieten';
$lang['adminimport'] = 'Admins können alle Felder eingeben (für Import)';
-$lang['usecocomment'] = 'Kommentare mit coComment verfolgen';
$lang['wikisyntaxok'] = 'Wiki-Syntax in Kommentaren erlauben';
$lang['subscribe'] = 'De-/Aktivieren der Abo-Funktion für Kommentare';
$lang['newestfirst'] = 'Neuste Kommentare als erstes anzeigen';
diff --git a/public_html/lib/plugins/discussion/lang/de/lang.php
b/public_html/lib/plugins/discussion/lang/de/lang.php
index 60e77729..a93361a9 100644
--- a/public_html/lib/plugins/discussion/lang/de/lang.php
+++ b/public_html/lib/plugins/discussion/lang/de/lang.php
@@ -3,9 +3,10 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
- * @author Esther Brunner <wikides...@gmail.com>
- * @author iDo <ilove...@gmail.com>
+ * @author Esther Brunner <wikides...@gmail.com>
+ * @author iDo <ilove...@gmail.com>
* @author Dominik Eckelmann <deckelm...@gmail.com>
+ * @author Padhie <deve...@padhie.de>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -14,6 +15,7 @@ $lang['discussion'] = 'Diskussion';
$lang['comment'] = 'Kommentar';
$lang['comments'] = 'Kommentare';
$lang['nocomments'] = 'Kommentare';
+$lang['threads'] = 'Gespräche';
$lang['url'] = 'Webseite';
$lang['address'] = 'Adresse';
$lang['date'] = 'Datum';
@@ -27,7 +29,7 @@ $lang['btn_show'] = 'Einblenden';
$lang['btn_change'] = 'Ändern';
$lang['statuschanged'] = 'Status der Diskussion geändert';
$lang['wordblock'] = 'Ihr Kommentar wurde als Spam blockiert.';
-$lang['moderation'] = 'Dein Kommentar wurde hinzugefügt und wartet
auf Freigabe.';
+$lang['moderation'] = 'Ihr Kommentar wurde hinzugefügt und wartet
auf Freigabe.';
$lang['mail_newcomment'] = 'Neuer Kommentar';
$lang['subscribe'] = 'Kommentare abonnieren';
$lang['noguests'] = 'Melden Sie sich an, um einen Kommentar zu
erstellen.';
diff --git a/public_html/lib/plugins/discussion/lang/de/settings.php
b/public_html/lib/plugins/discussion/lang/de/settings.php
index 5bc7b17b..45bad7de 100644
--- a/public_html/lib/plugins/discussion/lang/de/settings.php
+++ b/public_html/lib/plugins/discussion/lang/de/settings.php
@@ -3,11 +3,13 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
- * @author Esther Brunner <wikides...@gmail.com>
+ * @author Esther Brunner <wikides...@gmail.com>
* @author Dominik Eckelmann <deckelm...@gmail.com>
* @author Matthias Schulte <dokuw...@lupo49.de>
+ * @author Padhie <deve...@padhie.de>
*/
$lang['automatic'] = 'Standardmäßig Diskussionen auf allen Seiten';
+$lang['excluded_ns'] = 'Liste von Namespaces für die sich oben
befindlichen Optionen (ein Beispiel eines regulären Ausdrucks:
<code>/(playground|wiki)/</code> )';
$lang['allowguests'] = 'Kommentare von Gästen erlauben';
$lang['showguests'] = 'Erlaube Gästen Kommentare zu lesen';
$lang['linkemail'] = 'Name mit E-Mail verlinken';
@@ -15,7 +17,6 @@ $lang['useavatar'] = 'Avatar in Kommentaren
verwenden';
$lang['urlfield'] = 'Eingabefeld für URL anbieten';
$lang['addressfield'] = 'Eingabefeld für Adresse anbieten';
$lang['adminimport'] = 'Admins können alle Felder eingeben (für
Import)';
-$lang['usecocomment'] = 'Kommentare mit coComment verfolgen';
$lang['wikisyntaxok'] = 'Wiki-Syntax in Kommentaren erlauben';
$lang['subscribe'] = 'De-/Aktivieren der Abo-Funktion für
Kommentare';
$lang['newestfirst'] = 'Neuste Kommentare als erstes anzeigen';
@@ -28,3 +29,4 @@ $lang['threads_formposition_o_top'] = 'oben';
$lang['threads_formposition_o_bottom'] = 'unten';
$lang['visibilityButton'] = 'Schaltfläche anzeigen, mit der der
Discussion-Abschnitt aus-/eingeblendet werden kann';
$lang['moderatorgroups'] = 'Komma-separierte Liste mit
Moderatoren-Gruppen (gleichzusetzen mit der Berechtigung eines
DokuWiki-Managers)';
+$lang['moderatorsnotify'] = 'Sende eine Hinweisemail an Moderatoren bei
neuem Kommentar';
diff --git a/public_html/lib/plugins/discussion/lang/el/settings.php
b/public_html/lib/plugins/discussion/lang/el/settings.php
index 171722ee..6869f6e5 100644
--- a/public_html/lib/plugins/discussion/lang/el/settings.php
+++ b/public_html/lib/plugins/discussion/lang/el/settings.php
@@ -15,7 +15,6 @@ $lang['useavatar'] = 'χρήση εικόνων avatar των χρηστών
$lang['urlfield'] = 'επέτρεψε εισαγωγή URL από χρήστες';
$lang['addressfield'] = 'επέτρεψε στους χρήστες να εισάγουν διεύθυνση
ταχυδρομείου';
$lang['adminimport'] = 'επέτρεψε στους διαχειριστές να θέσουν προς εισαγωγή
όλα τα πεδία';
-$lang['usecocomment'] = 'χρησιμοποίησε ανίχνευση σχολίων coComment';
$lang['wikisyntaxok'] = 'επέτρεψε κώδικα wiki στα σχόλια';
$lang['subscribe'] = 'ενεργοποίηση/απενεργοποίηση της δυνατότητας εγγραφής
σε ενημερώσεις για νέα σχόλια';
$lang['newestfirst'] = 'να προβάλλονται πρώτα τα νεότερα σχόλια';
diff --git a/public_html/lib/plugins/discussion/lang/en/settings.php
b/public_html/lib/plugins/discussion/lang/en/settings.php
index 90597690..ada64d66 100644
--- a/public_html/lib/plugins/discussion/lang/en/settings.php
+++ b/public_html/lib/plugins/discussion/lang/en/settings.php
@@ -16,7 +16,6 @@ $lang['useavatar'] = 'use avatar user images for comments';
$lang['urlfield'] = 'allow users to enter an URL';
$lang['addressfield'] = 'allow users to enter a postal address';
$lang['adminimport'] = 'allow admins to set all fields for import';
-$lang['usecocomment'] = 'use coComment comment tracking';
$lang['wikisyntaxok'] = 'allow wiki syntax in comments';
$lang['subscribe'] = 'enable/disable subscribe to comments';
$lang['newestfirst'] = 'list newest comments first';
@@ -33,4 +32,5 @@ $lang['threads_formposition_o_bottom'] = 'bottom';
$lang['visibilityButton'] = 'Enable button for toggling the visibility of the
discussion section';
$lang['moderatorgroups'] = 'Comma-separated list of moderator groups (equal
to DokuWiki-Manager permission level)';
+$lang['moderatorsnotify'] = 'Send notification emails of the new comments to
moderators';
//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/public_html/lib/plugins/discussion/lang/eo/confirmsubscribe.txt
b/public_html/lib/plugins/discussion/lang/eo/confirmsubscribe.txt
index aa606314..025b5901 100644
--- a/public_html/lib/plugins/discussion/lang/eo/confirmsubscribe.txt
+++ b/public_html/lib/plugins/discussion/lang/eo/confirmsubscribe.txt
@@ -1,9 +1,8 @@
Saluton!
-Iu petis aboni komentojn de la paĝo @PAGE@ en @TITLE@.
-
-Por konfirmi, ke la peto estis vere via, bonvolu klaki jenan ligilon:
+Per tio vi abonas komentojn de la paĝo @PAGE@ en @TITLE@.
+Por konfirmi la abonon bv. klaki jenan ligilon:
@SUBSCRIBE@
--
diff --git a/public_html/lib/plugins/discussion/lang/eo/lang.php
b/public_html/lib/plugins/discussion/lang/eo/lang.php
index fb7e5c41..a4b4a313 100644
--- a/public_html/lib/plugins/discussion/lang/eo/lang.php
+++ b/public_html/lib/plugins/discussion/lang/eo/lang.php
@@ -3,8 +3,9 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
- * @author Felipe Castro <fef...@yahoo.com.br>
+ * @author Felipe Castro <fef...@yahoo.com.br>
* @author Robert Bogenschneider <b...@uea.org>
+ * @author Robert Bogenschneider <ro...@gmx.de>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
@@ -13,6 +14,7 @@ $lang['discussion'] = 'Diskuto';
$lang['comment'] = 'Komento';
$lang['comments'] = 'Komentoj';
$lang['nocomments'] = 'Komentoj';
+$lang['threads'] = 'Diskutoj';
$lang['url'] = 'Retpaĝo';
$lang['address'] = 'Adreso';
$lang['date'] = 'Dato';
diff --git a/public_html/lib/plugins/discussion/lang/eo/settings.php
b/public_html/lib/plugins/discussion/lang/eo/settings.php
index 4b6060db..0836700d 100644
--- a/public_html/lib/plugins/discussion/lang/eo/settings.php
+++ b/public_html/lib/plugins/discussion/lang/eo/settings.php
@@ -3,18 +3,19 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
- * @author Felipe Castro <fef...@yahoo.com.br>
+ * @author Felipe Castro <fef...@yahoo.com.br>
* @author Robert Bogenschneider <b...@uea.org>
+ * @author Robert Bogenschneider <ro...@gmx.de>
*/
$lang['automatic'] = 'meti diskutan sekcion por ĉiu paĝo apriore';
-$lang['allowguests'] = 'permesi komentojn de neregistritaj uzuloj';
+$lang['excluded_ns'] = 'listo de nomspacoj, en kiuj ne validas la
supra opcio (regula esprimo, ekz. <code>/(playground|wiki)/</code> )';
+$lang['allowguests'] = 'permesi komentojn de neregistritaj uzantoj';
$lang['showguests'] = 'permesi al gastoj legi komentojn';
-$lang['linkemail'] = 'aldoni ligilon por emejlo de la uzuloj';
+$lang['linkemail'] = 'aldoni ligilon por retpoŝto de la uzantoj';
$lang['useavatar'] = 'uzi avatarbildon por komentoj';
-$lang['urlfield'] = 'permesi uzulojn inkludi URL-on';
-$lang['addressfield'] = 'permesi uzulojn inkludi posxtan adreson';
+$lang['urlfield'] = 'permesi al uzantoj inkludi URL-on';
+$lang['addressfield'] = 'permesi al uzantoj inkludi poŝtan adreson';
$lang['adminimport'] = 'permesi administrantojn difini cxiujn erojn
por importo';
-$lang['usecocomment'] = 'uzi kromkomentan postsekvadon';
$lang['wikisyntaxok'] = 'permesi vikian sintakson en komentoj';
$lang['subscribe'] = 'permesi/malebligi abonadon de komentoj';
$lang['newestfirst'] = 'listigi plej novajn komentojn unue';
diff --git a/public_html/lib/plugins/discussion/lang/eo/subscribermail.txt
b/public_html/lib/plugins/discussion/lang/eo/subscribermail.txt
index 8933885b..a2c5f330 100644
--- a/public_html/lib/plugins/discussion/lang/eo/subscribermail.txt
+++ b/public_html/lib/plugins/discussion/lang/eo/subscribermail.txt
@@ -1,6 +1,6 @@
Saluton!
-Nova komento estis aldonata al la pagxo @PAGE@ en la vikio @TITLE@.
+Nova komento estis aldonata al la paĝo @PAGE@ en la vikio @TITLE@.
Dato: @DATE@
Nomo: @NAME@
@@ -11,9 +11,9 @@ Komento:
@TEXT@
--------------------------------------------------------
-Por malaligxi el cxi tiu pagxo, ensalutu en la vikio kaj klaku tie:
+Por malaliĝi el ĉi tiu paĝo, ensalutu en la vikio kaj klaku tie:
@UNSUBSCRIBE@
--
-Cxi tiu mesagxo estis naskita de DokuWiki en
+Ĉi tiu mesaĝo kreiĝis de DokuWiki en
@DOKUWIKIURL@
diff --git a/public_html/lib/plugins/discussion/lang/es/settings.php
b/public_html/lib/plugins/discussion/lang/es/settings.php
index 54b04c17..3ddc0877 100644
--- a/public_html/lib/plugins/discussion/lang/es/settings.php
+++ b/public_html/lib/plugins/discussion/lang/es/settings.php
@@ -15,7 +15,6 @@ $lang['useavatar'] = 'usar avatar del usuario
para los comentarios';
$lang['urlfield'] = 'permitir a los usuarios ingresar una URL';
$lang['addressfield'] = 'permitir a los usuarios ingresar una
dirección postal';
$lang['adminimport'] = 'permitir a los administradores definir todos
los campos a insertar';
-$lang['usecocomment'] = 'usar seguimiento de comentarios coComment';
$lang['wikisyntaxok'] = 'permitir sintaxis wiki en comentarios';
$lang['subscribe'] = 'activar/desactivar la suscripción a
comentarios';
$lang['newestfirst'] = 'listar nuevos comentarios primero';
diff --git a/public_html/lib/plugins/discussion/lang/fa/confirmsubscribe.txt
b/public_html/lib/plugins/discussion/lang/fa/confirmsubscribe.txt
new file mode 100644
index 00000000..7b1652aa
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/fa/confirmsubscribe.txt
@@ -0,0 +1,9 @@
+سلام!
+شما در دیدگاههای صفحهی @PAGE@ در @TITLE@ مشترک شدهاید.
+
+برای فعالسازی اشتراکتان لطفا روی این لینک کلیک کنید:
+@SUBSCRIBE@
+
+--
+این ایمیل به طور خودکار ارسال شده است از
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/public_html/lib/plugins/discussion/lang/fa/lang.php
b/public_html/lib/plugins/discussion/lang/fa/lang.php
new file mode 100644
index 00000000..12c20130
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/fa/lang.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ * @author Sam01 <m.sajad...@gmail.com>
+ */
+$lang['encoding'] = 'utf-8';
+$lang['direction'] = 'ltr';
+$lang['menu'] = 'مدیریت بحث و دیدگاهها';
+$lang['discussion'] = 'بحث';
+$lang['comment'] = 'دیدگاه';
+$lang['comments'] = 'دیدگاهها';
+$lang['nocomments'] = 'دیدگاهها';
+$lang['threads'] = 'بحثها';
+$lang['url'] = 'وبسایت';
+$lang['address'] = 'نشانی';
+$lang['date'] = 'تاریخ';
+$lang['entercomment'] = 'دیدگاهی را بنویسید';
+$lang['wikisyntax'] = 'الگوهای ویکی فعال باشد';
+$lang['older'] = 'بحثهای قدیمیتر';
+$lang['newer'] = 'بحثهای جدیدتر';
+$lang['btn_reply'] = 'پاسخ دادن';
+$lang['btn_hide'] = 'مخفی';
+$lang['btn_show'] = 'نمایش';
+$lang['btn_change'] = 'تغییر';
+$lang['statuschanged'] = 'وضعیت بحث تغییر یافت';
+$lang['wordblock'] = 'دیدگاه شما اسپم شناخته شد.';
+$lang['moderation'] = 'دیدگاه شما متنظر تایید شدن است.';
+$lang['mail_newcomment'] = 'دیدگاه جدید';
+$lang['subscribe'] = 'مشترک شدن در دیدگاهها';
+$lang['noguests'] = 'میتوانید دیدگاه بگذارید اگر وارد شده
باشید.';
+$lang['status'] = 'وضعیت';
+$lang['off'] = 'خاموش';
+$lang['open'] = 'باز';
+$lang['closed'] = 'بسته شد';
+$lang['reply'] = 'پاسخ';
+$lang['replies'] = 'پاسخها';
+$lang['newthread'] = 'صفحه بحث جدید';
+$lang['toggle_display'] = 'مخفیکردن/نمایشدادن';
diff --git a/public_html/lib/plugins/discussion/lang/fa/settings.php
b/public_html/lib/plugins/discussion/lang/fa/settings.php
new file mode 100644
index 00000000..2b31dd63
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/fa/settings.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ * @author Sam01 <m.sajad...@gmail.com>
+ */
+$lang['automatic'] = 'وجود بخش بحث در هر صفحه بهطور خودکار';
+$lang['excluded_ns'] = 'لیست فضاینامهای برای برگرداندن گزینه بالا
(یک عبارت منظم مثال e.g. <code>/(playground|wiki)/</code> )';
+$lang['allowguests'] = 'اجازهی ارسال دیدگاه توسط مهمانها';
+$lang['showguests'] = 'اجازهی خواندن دیدگاه توسط مهمانها';
+$lang['linkemail'] = 'لینک نویسنده به همراه ایمیل';
+$lang['useavatar'] = 'استفاده از آواتار کاربران برای دیدگاهها';
+$lang['urlfield'] = 'اجازه دادن برای وارد کردن یک آدرس اینترنتی';
+$lang['addressfield'] = 'اجازه دادن به کاربران برای وارد کردن آدرس
پستی';
+$lang['adminimport'] = 'اجازهی مدیران برای مهم کردن همهی بخشها';
+$lang['wikisyntaxok'] = 'فعال بودن الگوهای نوشتاری ویکی در دیدگاهها';
+$lang['subscribe'] = 'نمایشدادن/نمایشندادن دکمه اشتراک برای
دیدگاهها';
+$lang['newestfirst'] = 'لیست دیدگاههای جدید اول';
+$lang['moderate'] = 'مدیریت دیدگاههای جدید';
+$lang['usethreading'] = 'فعال بودن ریسهبندی دیدگاهها';
+$lang['userealname'] = 'نمایش نام واقعی به جای نام کاربری برای
کاربران ویکی';
+$lang['threads_formposition'] = 'موقعیت فرم موضوع جدید نشان داده شده توسط
<code>{{threads> }}</code> الگوی نگارشی';
+$lang['threads_formposition_o_off'] = 'خاموش';
+$lang['threads_formposition_o_top'] = 'بالا';
+$lang['threads_formposition_o_bottom'] = 'پایین';
+$lang['visibilityButton'] = 'فعال بودن دکمه برای مبدل پدیداری برای بحث
انتخاب شده';
+$lang['moderatorgroups'] = 'فهرست گروههای مدیریتکننده جداکردن با کاما
(برابر با سطح اجازهی مدیر دوکوویکی)';
+$lang['moderatorsnotify'] = 'ارسال ایمیل اطلاعیه به مدیران وقتی دیدگاهی
اضافه شد';
diff --git a/public_html/lib/plugins/discussion/lang/fa/subscribermail.txt
b/public_html/lib/plugins/discussion/lang/fa/subscribermail.txt
new file mode 100644
index 00000000..74030c94
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/fa/subscribermail.txt
@@ -0,0 +1,18 @@
+سلام!
+یک دیدگاه جدید اضافه شده به صفحهی @PAGE@ در @TITLE@ .
+
+زمان: @DATE@
+نام: @NAME@
+آدرس: @COMMENTURL@
+
+دیدگاه:
+--------------------------------------------------------
+@TEXT@
+--------------------------------------------------------
+
+برای لغو اشتراک روی لینک کلیک کنید:
+@UNSUBSCRIBE@
+
+--
+این ایمیل به طور خودکار ارسال شده است از
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/public_html/lib/plugins/discussion/lang/fi/settings.php
b/public_html/lib/plugins/discussion/lang/fi/settings.php
index b20294c8..597215a8 100644
--- a/public_html/lib/plugins/discussion/lang/fi/settings.php
+++ b/public_html/lib/plugins/discussion/lang/fi/settings.php
@@ -15,7 +15,6 @@ $lang['useavatar'] = 'käytä avatar-käyttäjäkuvia
kommentteihin';
$lang['urlfield'] = 'salli käyttjien antaa URL';
$lang['addressfield'] = 'salli käyttäjien antaa postiosoite';
$lang['adminimport'] = 'salli hallinnoijan asettaa kaikki kentät
vienti-toimintoa varten';
-$lang['usecocomment'] = 'käytä coComment -kommentin seurantaa';
$lang['wikisyntaxok'] = 'salli wiki syntaksi kommenteissa';
$lang['subscribe'] = 'aseta kommenttien tilaaminen päälle/pois';
$lang['newestfirst'] = 'listaa uusimmat kommentit ensin';
diff --git a/public_html/lib/plugins/discussion/lang/fr/confirmsubscribe.txt
b/public_html/lib/plugins/discussion/lang/fr/confirmsubscribe.txt
index b8f06cab..17ae7b7f 100644
--- a/public_html/lib/plugins/discussion/lang/fr/confirmsubscribe.txt
+++ b/public_html/lib/plugins/discussion/lang/fr/confirmsubscribe.txt
@@ -4,6 +4,6 @@ Vous êtes sur le point de souscrire aux commentaires de la page
@PAGE@ du wiki
Pour confirmer votre souscription, merci de suivre ce lien :
@SUBSCRIBE@
---
-Ce mail a été généré par DokuWiki à
+--
+Courriel généré par DokuWiki à
@DOKUWIKIURL@
\ No newline at end of file
diff --git a/public_html/lib/plugins/discussion/lang/fr/lang.php
b/public_html/lib/plugins/discussion/lang/fr/lang.php
index c63e2fe7..80dfc6bc 100644
--- a/public_html/lib/plugins/discussion/lang/fr/lang.php
+++ b/public_html/lib/plugins/discussion/lang/fr/lang.php
@@ -9,10 +9,11 @@
* @author iDo <ilove...@gmail.com>
* @author Nicolas Charpenel <n.charpe...@laposte.net>
* @author Nicolas Friedli <nico...@theologique.ch>
+ * @author Simon DELAGE <simon.geekit...@gmail.com>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
-$lang['menu'] = 'Discussions modérés';
+$lang['menu'] = 'Discussions modérées';
$lang['discussion'] = 'Discussion';
$lang['comment'] = 'Commentaire';
$lang['comments'] = 'Commentaires';
diff --git a/public_html/lib/plugins/discussion/lang/fr/settings.php
b/public_html/lib/plugins/discussion/lang/fr/settings.php
index 686759ce..8f921260 100644
--- a/public_html/lib/plugins/discussion/lang/fr/settings.php
+++ b/public_html/lib/plugins/discussion/lang/fr/settings.php
@@ -8,26 +8,27 @@
* @author Benjamin HKB <http://benjamin.hkb.free.fr>
* @author Nicolas Charpenel <n.charpe...@laposte.net>
* @author Nicolas Friedli <nico...@theologique.ch>
+ * @author Schplurtz le Déboulonné <schplu...@laposte.net>
*/
$lang['automatic'] = 'Discussion sur toutes les pages par défaut';
-$lang['excluded_ns'] = 'listes des espaces de noms pour lesquels
inverser l\'option générale (sous forme d\'expression régulière, p.ex.
<code>/(playground|wiki)/</code> )';
-$lang['allowguests'] = 'Permettre les commentaires des utilisateurs
non-enregistrés';
+$lang['excluded_ns'] = 'listes des catégories pour lesquelles
inverser l\'option générale (sous forme d\'expression régulière, p.ex.
<code>/(playground|wiki)/</code> )';
+$lang['allowguests'] = 'Autoriser les commentaires des utilisateurs
non-enregistrés';
$lang['showguests'] = 'autoriser les visiteurs à lire les
commentaires';
$lang['linkemail'] = 'Mettre un lien vers l\'email de la personne
qui commente';
$lang['useavatar'] = 'Utiliser les avatars pour les commentaires';
$lang['urlfield'] = 'Affichage d\'un champ URL';
$lang['addressfield'] = 'Affichage d\'un champ adresse postale';
$lang['adminimport'] = 'Permettre aux administrateurs de saisir tous
les champs pour l\'import';
-$lang['usecocomment'] = 'Utiliser coComment tracking';
$lang['wikisyntaxok'] = 'Autoriser la syntaxe wiki dans les
commentaires';
$lang['subscribe'] = 'activer/désactiver les souscriptions aux
commentaires';
$lang['newestfirst'] = 'lister les commentaires les plus récents en
premier';
$lang['moderate'] = 'modérer les nouveaux commentaires';
$lang['usethreading'] = 'autoriser les commentaires en arborescence';
-$lang['userealname'] = 'afficher le nom réel plutôt que le nom
d\'utilisateur des utilisateurs enregistrés';
+$lang['userealname'] = 'afficher le nom réel plutôt que
l\'identifiant des utilisateurs enregistrés';
$lang['threads_formposition'] = 'Position du champ de saisie des
commentaires';
$lang['threads_formposition_o_off'] = 'désactivé';
$lang['threads_formposition_o_top'] = 'haut';
$lang['threads_formposition_o_bottom'] = 'bas';
$lang['visibilityButton'] = 'Montrer un bouton activant l\'affichage de
la section de discussion';
-$lang['moderatorgroups'] = 'Liste séparée par des points-virgules des
groupes de moderateurs (équivalent aux niveaux de permission du
DokuWiki-Manager)';
+$lang['moderatorgroups'] = 'Liste séparée par des virgules des groupes
de moderateurs (équivalent aux niveaux de permission du DokuWiki-Manager)';
+$lang['moderatorsnotify'] = 'En cas de nouveaux commentaires, notifier
les modérateurs par courriel.';
diff --git a/public_html/lib/plugins/discussion/lang/fr/subscribermail.txt
b/public_html/lib/plugins/discussion/lang/fr/subscribermail.txt
index e5ac878b..fb190496 100644
--- a/public_html/lib/plugins/discussion/lang/fr/subscribermail.txt
+++ b/public_html/lib/plugins/discussion/lang/fr/subscribermail.txt
@@ -14,6 +14,6 @@ Commentaire:
Pour vous désinscrire de cette page connectez vous au wiki puis cliquez sur ce
lien:
@UNSUBSCRIBE@
---
-Ce mail a été créé par DokuWiki à
+--
+Courriel créé par DokuWiki à
@DOKUWIKIURL@
diff --git a/public_html/lib/plugins/discussion/lang/hr/settings.php
b/public_html/lib/plugins/discussion/lang/hr/settings.php
index f4450a3f..eba77be2 100644
--- a/public_html/lib/plugins/discussion/lang/hr/settings.php
+++ b/public_html/lib/plugins/discussion/lang/hr/settings.php
@@ -14,7 +14,6 @@ $lang['useavatar'] = 'koristi slike korisničkih
avatara na komentar
$lang['urlfield'] = 'dozvoli korisnicima unos URL-ova';
$lang['addressfield'] = 'dozvoli korisnicima unos poštanske adrese';
$lang['adminimport'] = 'dozvoli administratorima da postave sva
polja za unos';
-$lang['usecocomment'] = 'koristi coComment za praćenje komentara';
$lang['wikisyntaxok'] = 'dozvoli wiki sintaksu u komentarima';
$lang['subscribe'] = 'dozvoli pretplate na komentare';
$lang['newestfirst'] = 'prikaži prvo najnovije komentare';
@@ -27,3 +26,4 @@ $lang['threads_formposition_o_top'] = 'vrh';
$lang['threads_formposition_o_bottom'] = 'dno';
$lang['visibilityButton'] = 'Omogući gumb za kontrolu vidljivosti
odjeljka rasprava';
$lang['moderatorgroups'] = 'Zarezom odvojena lista grupa moderatora
(identično postavci DokuWiki-Manager)';
+$lang['moderatorsnotify'] = 'Pošalji obavijest poštom moderatorima o
novim komentarima';
diff --git a/public_html/lib/plugins/discussion/lang/hu/settings.php
b/public_html/lib/plugins/discussion/lang/hu/settings.php
index 84b84521..df1e88fb 100644
--- a/public_html/lib/plugins/discussion/lang/hu/settings.php
+++ b/public_html/lib/plugins/discussion/lang/hu/settings.php
@@ -14,7 +14,6 @@ $lang['useavatar'] = 'használjon avatar képeket a
hozzászólások
$lang['urlfield'] = 'felhasználók megadhatnak egy weboldalt';
$lang['addressfield'] = 'felhasználók megadhatják a címüket';
$lang['adminimport'] = 'adminok hozzászóláskor minden mezőt külön
megadhatnak';
-$lang['usecocomment'] = 'coComment komment követés használata';
$lang['wikisyntaxok'] = 'wiki szintaxis engedélyezése kommentekben';
$lang['subscribe'] = 'kommentekre feliratkozás engedélyezése';
$lang['newestfirst'] = 'újabb hozzászólásokat mutassa fölül';
diff --git a/public_html/lib/plugins/discussion/lang/it/confirmsubscribe.txt
b/public_html/lib/plugins/discussion/lang/it/confirmsubscribe.txt
new file mode 100644
index 00000000..9cdcd988
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/it/confirmsubscribe.txt
@@ -0,0 +1,10 @@
+Ciao!
+
+Stai per sottoscrivere i commenti alla pagina @PAGE@ del wiki @TITLE@.
+
+Per confermare la sottoscrizione si prega di seguire questo link:
+@SUBSCRIBE@
+
+--
+Questa mail è stata generata dal DokuWiki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/public_html/lib/plugins/discussion/lang/it/lang.php
b/public_html/lib/plugins/discussion/lang/it/lang.php
index cd3ded6b..312b7596 100644
--- a/public_html/lib/plugins/discussion/lang/it/lang.php
+++ b/public_html/lib/plugins/discussion/lang/it/lang.php
@@ -1,47 +1,41 @@
<?php
+
/**
- * Italian language file
- *
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author Fabio Asnicar <fabio.asni...@gmail.com>
+ *
+ * @author Fabio Asnicar <fabio.asni...@gmail.com>
+ * @author Marco Fenoglio <marco.fenog...@gmail.com>
*/
-
-// settings must be present and set appropriately for the language
-$lang['encoding'] = 'utf-8';
-$lang['direction'] = 'ltr';
-
-// for admin plugins, the menu prompt to be displayed in the admin menu
-// if set here, the plugin doesn't need to override the getMenuText() method
-$lang['menu'] = 'Modera Discussioni';
-
-$lang['discussion'] = 'Discussione';
-$lang['comment'] = 'Commento';
-$lang['comments'] = 'Commenti';
-$lang['nocomments'] = 'Commenti';
-$lang['url'] = 'Sito web';
-$lang['address'] = 'Indirizzo';
-$lang['date'] = 'Data';
-$lang['entercomment'] = 'Inserisci un commento';
-$lang['wikisyntax'] = 'Sintassi del wiki permessa';
-$lang['older'] = 'Vecchie discussioni';
-$lang['newer'] = 'Nuove discussioni';
-$lang['btn_reply'] = 'Rispondi';
-$lang['btn_hide'] = 'Nascondi';
-$lang['btn_show'] = 'Mostra';
-$lang['btn_change'] = 'Modifica';
-$lang['statuschanged'] = 'Stato discussione modificato';
-$lang['wordblock'] = 'Il tuo commento è stato bloccato in quanto
riconosciuto come SPAM.';
-$lang['mail_newcomment'] = 'Nuovo Commento';
-$lang['subscribe'] = 'Sottoscrizione dei commenti';
-
-$lang['status'] = 'Stato';
-$lang['off'] = 'Disattivo';
-$lang['open'] = 'Aperto';
-$lang['closed'] = 'Chiuso';
-
-$lang['reply'] = 'Rispondi';
-$lang['replies'] = 'Risposte';
-$lang['newthread'] = 'Nuovo argomento';
-$lang['threads'] = 'Argomenti';
-
-//Setup VIM: ex: et ts=2 enc=utf-8 :
\ No newline at end of file
+$lang['encoding'] = 'utf-8';
+$lang['direction'] = 'ltr';
+$lang['menu'] = 'Modera Discussioni';
+$lang['discussion'] = 'Discussione';
+$lang['comment'] = 'Commento';
+$lang['comments'] = 'Commenti';
+$lang['nocomments'] = 'Commenti';
+$lang['threads'] = 'Argomenti';
+$lang['url'] = 'Sito web';
+$lang['address'] = 'Indirizzo';
+$lang['date'] = 'Data';
+$lang['entercomment'] = 'Inserisci un commento';
+$lang['wikisyntax'] = 'Sintassi del wiki permessa';
+$lang['older'] = 'Vecchie discussioni';
+$lang['newer'] = 'Nuove discussioni';
+$lang['btn_reply'] = 'Rispondi';
+$lang['btn_hide'] = 'Nascondi';
+$lang['btn_show'] = 'Mostra';
+$lang['btn_change'] = 'Modifica';
+$lang['statuschanged'] = 'Stato discussione modificato';
+$lang['wordblock'] = 'Il tuo commento è stato bloccato in quanto
riconosciuto come SPAM.';
+$lang['moderation'] = 'Il tuo commento è stato aggiunto ed è in
attesa di moderazione.';
+$lang['mail_newcomment'] = 'Nuovo Commento';
+$lang['subscribe'] = 'Sottoscrizione dei commenti';
+$lang['noguests'] = 'Potresti lasciare un commento se ti fossi
autenticato.';
+$lang['status'] = 'Stato';
+$lang['off'] = 'Disattivo';
+$lang['open'] = 'Aperto';
+$lang['closed'] = 'Chiuso';
+$lang['reply'] = 'Rispondi';
+$lang['replies'] = 'Risposte';
+$lang['newthread'] = 'Nuovo argomento';
+$lang['toggle_display'] = 'Mostra/Nascondi';
diff --git a/public_html/lib/plugins/discussion/lang/it/settings.php
b/public_html/lib/plugins/discussion/lang/it/settings.php
index b1979926..14b17e8f 100644
--- a/public_html/lib/plugins/discussion/lang/it/settings.php
+++ b/public_html/lib/plugins/discussion/lang/it/settings.php
@@ -1,29 +1,31 @@
<?php
+
/**
- * Italian language file
- *
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author Fabio Asnicar <fabio.asni...@gmail.com>
- * @author Diego Pierotto <ita.translati...@tiscali.it>
+ *
+ * @author Fabio Asnicar <fabio.asni...@gmail.com>
+ * @author Diego Pierotto <ita.translati...@tiscali.it>
+ * @author Marco Fenoglio <marco.fenog...@gmail.com>
*/
-
-// for the configuration manager
-$lang['automatic'] = 'Sezione discussione su ogni pagina in modo
predefinito';
-$lang['allowguests'] = 'Permetti commenti da utenti non registrati';
-$lang['linkemail'] = 'Inserisci l\'indirizzo e-mail dell\'utente';
-$lang['useavatar'] = 'Usa l\'immagine dell\'avatar per identificare gli
utenti';
-$lang['urlfield'] = 'Permetti agli utenti di inserire un URL';
-$lang['addressfield'] = 'Permetti agli utenti di inserire un indirizzo email';
-$lang['adminimport'] = 'Permetti agli admin di impostare tutti i campi da
importare';
-$lang['usecocomment'] = 'Usa tracciamento commento coComment';
-$lang['wikisyntaxok'] = 'Permetti sintassi wiki nei commenti';
-$lang['subscribe'] = 'Abilita/disabilita sottoscrizione dei commenti';
-$lang['newestfirst'] = 'Elenca i nuovi commenti per primi';
-
-$lang['usethreading'] = 'Permetti albero dei commenti';
-
-$lang['threads_formposition'] = 'Posizione della casella del nuovo
commento';
-$lang['threads_formposition_o_top'] = 'In alto';
+$lang['automatic'] = 'Sezione discussione su ogni pagina in modo
predefinito';
+$lang['excluded_ns'] = 'elenco dei namespace per ripristinare
l\'opzione sopra (un\'espressione regolare, ad esempio
<code>/(playground|wiki)/</ code>)';
+$lang['allowguests'] = 'Permetti commenti da utenti non registrati';
+$lang['showguests'] = 'consentire agli ospiti di leggere i
commenti';
+$lang['linkemail'] = 'Inserisci l\'indirizzo e-mail dell\'utente';
+$lang['useavatar'] = 'Usa l\'immagine dell\'avatar per
identificare gli utenti';
+$lang['urlfield'] = 'Permetti agli utenti di inserire un URL';
+$lang['addressfield'] = 'Permetti agli utenti di inserire un
indirizzo email';
+$lang['adminimport'] = 'Permetti agli admin di impostare tutti i
campi da importare';
+$lang['wikisyntaxok'] = 'Permetti sintassi wiki nei commenti';
+$lang['subscribe'] = 'Abilita/disabilita sottoscrizione dei
commenti';
+$lang['newestfirst'] = 'Elenca i nuovi commenti per primi';
+$lang['moderate'] = 'moderare i nuovi commenti';
+$lang['usethreading'] = 'Permetti albero dei commenti';
+$lang['userealname'] = 'visualizzare il nome reale anziché il nome
utente degli utenti registrati al wiki';
+$lang['threads_formposition'] = 'Posizione della casella del nuovo commento';
+$lang['threads_formposition_o_off'] = 'spento';
+$lang['threads_formposition_o_top'] = 'In alto';
$lang['threads_formposition_o_bottom'] = 'In basso';
-
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+$lang['visibilityButton'] = 'Abilita il pulsante per attivare la
visibilità della sezione discussione';
+$lang['moderatorgroups'] = 'Lista dei moderatori dei commenti (gruppi
e/o utenti, separati da virgola)';
+$lang['moderatorsnotify'] = 'Invia ai moderatori le notifiche email dei
nuovi commenti';
diff --git a/public_html/lib/plugins/discussion/lang/it/subscribermail.txt
b/public_html/lib/plugins/discussion/lang/it/subscribermail.txt
index 1570c03c..cc5b3bf3 100644
--- a/public_html/lib/plugins/discussion/lang/it/subscribermail.txt
+++ b/public_html/lib/plugins/discussion/lang/it/subscribermail.txt
@@ -1,6 +1,6 @@
Ciao!
-Un nuovo commento è stato aggiunto alla pagina @PAGE@ nel wiki: @TITLE@
+Un nuovo commento è stato aggiunto alla pagina @PAGE@ nel wiki @TITLE@
Data: @DATE@
Nome: @NAME@
@@ -16,5 +16,5 @@ e quindi vai a questo indirizzo:
@UNSUBSCRIBE@
--
-questa mail è stata generata dal DokuWiki
+Questa mail è stata generata dal DokuWiki
@DOKUWIKIURL@
diff --git a/public_html/lib/plugins/discussion/lang/ja/lang.php
b/public_html/lib/plugins/discussion/lang/ja/lang.php
index 7726eaf2..d8741764 100644
--- a/public_html/lib/plugins/discussion/lang/ja/lang.php
+++ b/public_html/lib/plugins/discussion/lang/ja/lang.php
@@ -3,8 +3,8 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
- * @author Ikuo Obataya <i.obat...@gmail.com>
- * @author Yusuke Ishida <yusuke.ishida....@gmail.com>
+ * @author Ikuo Obataya <i.obat...@gmail.com>
+ * @author Yusuke Ishida <yusuke.ishida....@gmail.com>
* @author Hideaki SAWADA <ch...@live.jp>
*/
$lang['encoding'] = 'utf-8';
@@ -14,6 +14,7 @@ $lang['discussion'] = 'コメント';
$lang['comment'] = 'コメント';
$lang['comments'] = 'コメント';
$lang['nocomments'] = 'コメント';
+$lang['threads'] = 'コメント';
$lang['url'] = 'ウェブサイト';
$lang['address'] = '住所';
$lang['date'] = '日付';
diff --git a/public_html/lib/plugins/discussion/lang/ja/settings.php
b/public_html/lib/plugins/discussion/lang/ja/settings.php
index 6ccac657..da46771c 100644
--- a/public_html/lib/plugins/discussion/lang/ja/settings.php
+++ b/public_html/lib/plugins/discussion/lang/ja/settings.php
@@ -3,11 +3,12 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
- * @author Ikuo Obataya <i.obat...@gmail.com>
- * @author Yusuke Ishida <yusuke.ishida....@gmail.com>
+ * @author Ikuo Obataya <i.obat...@gmail.com>
+ * @author Yusuke Ishida <yusuke.ishida....@gmail.com>
* @author Hideaki SAWADA <ch...@live.jp>
*/
$lang['automatic'] = 'デフォルトで全てのページにコメントセクションを追加';
+$lang['excluded_ns'] = '上記オプションを元に戻す、名前空間の一覧（正規表現、例：
<code>/(playground|wiki)/</code>）';
$lang['allowguests'] = '登録していないユーザーのコメントを許可';
$lang['showguests'] = 'ゲストのコメント表示を許可';
$lang['linkemail'] = 'コメントした人の名前にe-mailリンクを貼る';
@@ -15,7 +16,6 @@ $lang['useavatar'] = 'コメントのアバターとしてユーザ
$lang['urlfield'] = 'ユーザーのURL入力を許可';
$lang['addressfield'] = 'ユーザーの郵便番号入力を許可';
$lang['adminimport'] = '管理者にインポートする為の全てのフィールドの設定を許可';
-$lang['usecocomment'] = 'coCommentトラッキングを使う';
$lang['wikisyntaxok'] = 'コメント内でもwiki文法を許可';
$lang['subscribe'] = 'コメント購読の有効／無効を表示';
$lang['newestfirst'] = '新しいコメントを最初に表示';
@@ -28,3 +28,4 @@ $lang['threads_formposition_o_top'] = '上';
$lang['threads_formposition_o_bottom'] = '下';
$lang['visibilityButton'] = 'コメントセクションの表示を切り替えるボタンを有効にする';
$lang['moderatorgroups'] = '承認者グループ（DokuWikiのマネージャー権限と同じレベル）のカンマ区切り一覧';
+$lang['moderatorsnotify'] = '承認者に対して新しいコメントの通知メールを送信する';
diff --git a/public_html/lib/plugins/discussion/lang/ko/confirmsubscribe.txt
b/public_html/lib/plugins/discussion/lang/ko/confirmsubscribe.txt
index 9ac204ba..eca0a3b3 100644
--- a/public_html/lib/plugins/discussion/lang/ko/confirmsubscribe.txt
+++ b/public_html/lib/plugins/discussion/lang/ko/confirmsubscribe.txt
@@ -1,6 +1,6 @@
안녕하세요!
-@TITLE@ 위키의 @PAGE@ 문서의 덧글을 구독하려고 합니다.
+@TITLE@ 위키의 @PAGE@ 문서의 댓글을 구독하려고 합니다.
구독을 확인하려면 이 링크를 따르세요:
@SUBSCRIBE@
diff --git a/public_html/lib/plugins/discussion/lang/ko/lang.php
b/public_html/lib/plugins/discussion/lang/ko/lang.php
index 6153bccf..24054aef 100644
--- a/public_html/lib/plugins/discussion/lang/ko/lang.php
+++ b/public_html/lib/plugins/discussion/lang/ko/lang.php
@@ -2,7 +2,7 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ *
* @author Kwangseob Kim<mrkwangs...@gmail.com>
* @author Myeongjin <aranet...@gmail.com>
*/
@@ -10,15 +10,15 @@ $lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
$lang['menu'] = '토론 중재';
$lang['discussion'] = '토론';
-$lang['comment'] = '덧글';
-$lang['comments'] = '덧글';
-$lang['nocomments'] = '덧글';
+$lang['comment'] = '댓글';
+$lang['comments'] = '댓글';
+$lang['nocomments'] = '댓글';
$lang['threads'] = '토론';
$lang['url'] = '웹사이트';
$lang['address'] = '주소';
$lang['date'] = '날짜';
-$lang['entercomment'] = '덧글을 입력하세요';
-$lang['wikisyntax'] = '위키 문법을 사용할 수 있습니다';
+$lang['entercomment'] = '댓글을 입력하세요';
+$lang['wikisyntax'] = '위키 문법이 허용됩니다';
$lang['older'] = '오래된 토론';
$lang['newer'] = '새 토론';
$lang['btn_reply'] = '답글';
@@ -26,16 +26,16 @@ $lang['btn_hide'] = '숨기기';
$lang['btn_show'] = '보이기';
$lang['btn_change'] = '바꾸기';
$lang['statuschanged'] = '토론 상태가 바뀌었습니다';
-$lang['wordblock'] = '덧글이 스팸으로 차단되었습니다.';
-$lang['moderation'] = '덧글이 등록되었으며 검토를 기다리고 있습니다.';
-$lang['mail_newcomment'] = '새 덧글';
-$lang['subscribe'] = '덧글 구독';
-$lang['noguests'] = '로그인하면 덧글을 남길 수 있습니다.';
+$lang['wordblock'] = '댓글이 스팸으로 차단되었습니다.';
+$lang['moderation'] = '댓글이 등록되었으며 중재를 기다리고 있습니다.';
+$lang['mail_newcomment'] = '새 댓글';
+$lang['subscribe'] = '댓글 구독';
+$lang['noguests'] = '로그인하면 댓글을 남길 수 있습니다.';
$lang['status'] = '상태';
$lang['off'] = '끄기';
$lang['open'] = '열기';
$lang['closed'] = '닫기';
-$lang['reply'] = '덧글';
-$lang['replies'] = '덧글';
+$lang['reply'] = '댓글';
+$lang['replies'] = '댓글';
$lang['newthread'] = '새 토론 문서';
$lang['toggle_display'] = '숨기기/보이기';
diff --git a/public_html/lib/plugins/discussion/lang/ko/settings.php
b/public_html/lib/plugins/discussion/lang/ko/settings.php
index 2d4ad542..971b4326 100644
--- a/public_html/lib/plugins/discussion/lang/ko/settings.php
+++ b/public_html/lib/plugins/discussion/lang/ko/settings.php
@@ -2,29 +2,29 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ *
* @author mrkwangseob<mrkwangs...@gmail.com>
* @author Myeongjin <aranet...@gmail.com>
*/
-$lang['automatic'] = '기본적으로 모든 문서에 토론 문단을 생성';
+$lang['automatic'] = '기본적으로 모든 문서에 토론 문단';
$lang['excluded_ns'] = '위 옵션을 되돌릴 이름공간의 목록 (정규 표현식 예를 들어
<code>/(playground|wiki)/</code> )';
-$lang['allowguests'] = '등록하지 않은 사용자가 덧글을 남길 수 있음';
-$lang['showguests'] = '손님이 덧글을 읽을 수 있음';
-$lang['linkemail'] = '이메일로 된 덧글을 남긴 사용자의 이름 링크';
-$lang['useavatar'] = '덧글에 아바타 사용자 그림 사용';
+$lang['allowguests'] = '등록하지 않은 사용자가 댓글을 남길 수 있음';
+$lang['showguests'] = '손님이 댓글을 읽을 수 있음';
+$lang['linkemail'] = '이메일로 된 댓글을 남긴 사용자의 이름 링크';
+$lang['useavatar'] = '댓글에 아바타 사용자 그림 사용';
$lang['urlfield'] = '사용자가 URL을 입력할 수 있음';
$lang['addressfield'] = '사용자가 우편 주소를 입력할 수 있음';
$lang['adminimport'] = '관리자가 가져오기에 대한 모든 필드를 설정할 수 있음';
-$lang['usecocomment'] = '다중 덧글 추적 사용';
-$lang['wikisyntaxok'] = '덧글에 위키 문법을 사용할 수 있음';
-$lang['subscribe'] = '덧글 구독 활성화/비활성화';
-$lang['newestfirst'] = '새 덧글을 먼저 나열';
-$lang['moderate'] = '새 덧글의 승인 필요';
-$lang['usethreading'] = '덧글의 스레드를 남길 수 있음';
-$lang['userealname'] = '등록된 위키 사용자의 실제 이름 대신 사용자 이름으로 나타내기';
-$lang['threads_formposition'] = '새 스레드 양식의 위치';
+$lang['wikisyntaxok'] = '댓글에 위키 문법을 사용할 수 있음';
+$lang['subscribe'] = '댓글 구독 활성화/비활성화';
+$lang['newestfirst'] = '새 댓글을 먼저 나열';
+$lang['moderate'] = '새 댓글 중재';
+$lang['usethreading'] = '댓글의 스레드를 남길 수 있음';
+$lang['userealname'] = '등록된 위키 사용자의 실명 대신 사용자 이름으로 표시';
+$lang['threads_formposition'] = '<code>{{threads> }}</code> 문법으로 보여지는 새 스레드
양식의 위치';
$lang['threads_formposition_o_off'] = '끄기';
$lang['threads_formposition_o_top'] = '위';
$lang['threads_formposition_o_bottom'] = '아래';
$lang['visibilityButton'] = '토론 문단의 보이기를 토글하는 버튼 활성화';
$lang['moderatorgroups'] = '중재자 그룹의 쉼표로 구분된 목록 (도쿠위키 관리자 권한 수준과 같음)';
+$lang['moderatorsnotify'] = '중재자에게 새 댓글의 알림 이메일 보내기';
diff --git a/public_html/lib/plugins/discussion/lang/ko/subscribermail.txt
b/public_html/lib/plugins/discussion/lang/ko/subscribermail.txt
index 4162aed8..e8f516a5 100644
--- a/public_html/lib/plugins/discussion/lang/ko/subscribermail.txt
+++ b/public_html/lib/plugins/discussion/lang/ko/subscribermail.txt
@@ -1,12 +1,12 @@
안녕하세요!
-@TITLE@ 위키의 @PAGE@ 문서에 새 덧글이 추가되었습니다.
+@TITLE@ 위키의 @PAGE@ 문서에 새 댓글이 추가되었습니다.
날짜: @DATE@
이름: @NAME@
URL: @COMMENTURL@
-덧글:
+댓글:
--------------------------------------------------------
@TEXT@
--------------------------------------------------------
diff --git a/public_html/lib/plugins/discussion/lang/nl/settings.php
b/public_html/lib/plugins/discussion/lang/nl/settings.php
index 22364e62..2de8febb 100644
--- a/public_html/lib/plugins/discussion/lang/nl/settings.php
+++ b/public_html/lib/plugins/discussion/lang/nl/settings.php
@@ -6,6 +6,7 @@
* @author Erwin Moller <er...@darwine.nl>
* @author mprins <mpr...@users.sf.net>
* @author Mijndert <mijnd...@mijndertstuij.nl>
+ * @author hugo smet <hugo.s...@scarlet.be>
*/
$lang['automatic'] = 'Discussie-sectie standaard op elke pagina';
$lang['excluded_ns'] = 'lijst van namespaces om bijgenoemde optie
terug te draaien (een reguliere expressie, b.v.
<code>/(playground|wiki)/</code>)';
@@ -16,7 +17,6 @@ $lang['useavatar'] = 'Gebruik avatar afbeeldingen
van gebruikers';
$lang['urlfield'] = 'Gebruikers mogen een url-veld invullen';
$lang['addressfield'] = 'Gebruikers mogen een adresveld invullen';
$lang['adminimport'] = 'Laat admins alle invoervelden zien';
-$lang['usecocomment'] = 'Gebruik coComment commentaar-volgen';
$lang['wikisyntaxok'] = 'Sta wiki syntax toe in reacties';
$lang['subscribe'] = 'In-/uitschakelen van e-mailinschrijvingen op
discussies';
$lang['newestfirst'] = 'Geef de nieuwste reacties eerst';
@@ -29,3 +29,4 @@ $lang['threads_formposition_o_top'] = 'boven';
$lang['threads_formposition_o_bottom'] = 'onder';
$lang['visibilityButton'] = 'Zet knop aan voor het in-/uitschakelen van
de zichtbaarheid van discussies';
$lang['moderatorgroups'] = 'Komma gescheiden lijst van moderator groepen
(gelijk aan het DokuWiki-Manager toegangsniveau)';
+$lang['moderatorsnotify'] = 'Stuur verwittigingsmails voor de nieuwe
opmerkingen naar de moderators';
diff --git a/public_html/lib/plugins/discussion/lang/no/confirmsubscribe.txt
b/public_html/lib/plugins/discussion/lang/no/confirmsubscribe.txt
new file mode 100644
index 00000000..d8610ece
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/no/confirmsubscribe.txt
@@ -0,0 +1,9 @@
+Hei!
+
+Du er nå i ferd med å abonnere på kommentarer på siden @PAGE@ i @TITTLE@ wiki.
+
+For å bekrefte dette abbonementet må du åpne følgende lenke:
+@SUBSCRIBE@
+
+--
+Denne meldingen ble generert av DokuWiki hos @DOKUWIKIURL@
\ No newline at end of file
diff --git a/public_html/lib/plugins/discussion/lang/no/lang.php
b/public_html/lib/plugins/discussion/lang/no/lang.php
new file mode 100644
index 00000000..ef406067
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/no/lang.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ * @author Danny Buckhof <daniel.rak...@hotmail.no>
+ * @author Arne Hanssen <arne.hans...@getmail.no>
+ */
+$lang['encoding'] = 'utf-8';
+$lang['direction'] = 'ltr';
+$lang['menu'] = 'Godkjenn diskusjoner';
+$lang['discussion'] = 'Diskusjon';
+$lang['comment'] = 'Kommentar';
+$lang['comments'] = 'Kommentarer';
+$lang['nocomments'] = 'Kommentarer';
+$lang['threads'] = 'Diskusjoner';
+$lang['url'] = 'Webside';
+$lang['address'] = 'Adresse';
+$lang['date'] = 'Dato';
+$lang['entercomment'] = 'Sett inn din kommentar';
+$lang['wikisyntax'] = 'Wikisyntaks er tillatt';
+$lang['older'] = 'Eldre diskusjoner';
+$lang['newer'] = 'Nyere diskusjoner';
+$lang['btn_reply'] = 'Svar';
+$lang['btn_hide'] = 'Gjem';
+$lang['btn_show'] = 'Vis';
+$lang['btn_change'] = 'Endre';
+$lang['statuschanged'] = 'Diskusjonsstatus endret';
+$lang['wordblock'] = 'Din kommentar ble avvist som spam';
+$lang['moderation'] = 'Din kommentar er lagt inn og avventer
godkjenning';
+$lang['mail_newcomment'] = 'Ny kommentar';
+$lang['subscribe'] = 'Abonner på kommentarer';
+$lang['noguests'] = 'Du kan legge inn en kommentar hvis du er
innlogget.';
+$lang['status'] = 'Status';
+$lang['off'] = 'av';
+$lang['open'] = 'åpen';
+$lang['closed'] = 'lukket';
+$lang['reply'] = 'Svar';
+$lang['replies'] = 'Flere svar';
+$lang['newthread'] = 'Ny diskusjonsside';
+$lang['toggle_display'] = 'Gjem/Vis';
diff --git a/public_html/lib/plugins/discussion/lang/no/settings.php
b/public_html/lib/plugins/discussion/lang/no/settings.php
new file mode 100644
index 00000000..567e56f3
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/no/settings.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ * @author Danny Buckhof <daniel.rak...@hotmail.no>
+ * @author Arne Hanssen <arne.hans...@getmail.no>
+ */
+$lang['automatic'] = 'diskusjonsmodul på hver side er standard';
+$lang['excluded_ns'] = 'liste over navnerom for å oppheve valget
over (et regulært uttrykk f.eks.<code>/(playground|wiki)/</code> )';
+$lang['allowguests'] = 'tillat kommentarer fra uregistrerte brukere';
+$lang['showguests'] = 'tillat gjester å lese kommentarer';
+$lang['linkemail'] = 'lenk kommentererens navn med e-post';
+$lang['useavatar'] = 'bruk avatar brukerbilder for kommentarer';
+$lang['urlfield'] = 'tillat brukere å legge inn URL';
+$lang['addressfield'] = 'tillat brukere å legge inn postadresse';
+$lang['adminimport'] = 'tillat administratorer å sette alle felt for
import';
+$lang['wikisyntaxok'] = 'tillat wikisyntaks i kommentarer';
+$lang['subscribe'] = 'aktiver/deaktiver abonnering av kommentarer';
+$lang['newestfirst'] = 'nyeste kommentarer øverst';
+$lang['moderate'] = 'godkjenn nye kommentarer';
+$lang['usethreading'] = 'tillat tråd for kommentarer';
+$lang['userealname'] = 'vis opprinnelig navn istedenfor brukernavn
for registrerte brukere';
+$lang['threads_formposition'] = 'posisjonen til den nye trådeboksen vist ved
hjelp av <code>{{threads> }}</code> syntaks';
+$lang['threads_formposition_o_off'] = 'av';
+$lang['threads_formposition_o_top'] = 'topp';
+$lang['threads_formposition_o_bottom'] = 'bunn';
+$lang['visibilityButton'] = 'Aktiver knapp for å bytte visningen av
diskusjonsmodulen';
+$lang['moderatorgroups'] = 'Kommaseparert liste over grupper med de som
godkjenner komentarer (lik DokuWiki-behandleren sine tilgangsnivå)';
+$lang['moderatorsnotify'] = 'Send kviteringspost for nye kommentarer til
de som godkjenner disse';
diff --git a/public_html/lib/plugins/discussion/lang/no/subscribermail.txt
b/public_html/lib/plugins/discussion/lang/no/subscribermail.txt
new file mode 100644
index 00000000..11c9af41
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/no/subscribermail.txt
@@ -0,0 +1,18 @@
+Hei!
+
+En ny kommentar er lagt til på siden @pages@ i @TITEL@ wiki.
+
+Dato: @DATE@
+Navn: @NAME@
+URL: @COMMENTURL@
+
+Kommentar:
+--------------------------------------------------------
+@TEXT@
+--------------------------------------------------------
+
+For å avslutte dette abonnementet klikk:
+@UNSUBSCRIBE@
+
+--
+Denne e-posten ble generert av DokuWiki hos @DOKUWIKIURL@
\ No newline at end of file
diff --git a/public_html/lib/plugins/discussion/lang/pt-br/lang.php
b/public_html/lib/plugins/discussion/lang/pt-br/lang.php
index 7beb1ff3..151cbd09 100644
--- a/public_html/lib/plugins/discussion/lang/pt-br/lang.php
+++ b/public_html/lib/plugins/discussion/lang/pt-br/lang.php
@@ -5,14 +5,16 @@
*
* @author Sidnei Neves <sid...@sidnei.org>
* @author Juliano Marconi Lanigra <juliano.marc...@gmail.com>
+ * @author Oze Projetos <o...@oze.net.br>
*/
$lang['encoding'] = 'utf-8';
$lang['direction'] = 'ltr';
-$lang['menu'] = 'Moderate Discussions';
+$lang['menu'] = 'Discussões Moderadas';
$lang['discussion'] = 'Discussão';
$lang['comment'] = 'Comentário';
$lang['comments'] = 'Comentários';
$lang['nocomments'] = 'Comentários';
+$lang['threads'] = 'Discussões';
$lang['url'] = 'Website';
$lang['address'] = 'Endereço';
$lang['date'] = 'Data';
diff --git a/public_html/lib/plugins/discussion/lang/pt-br/settings.php
b/public_html/lib/plugins/discussion/lang/pt-br/settings.php
index c90637ab..6a1bb3f3 100644
--- a/public_html/lib/plugins/discussion/lang/pt-br/settings.php
+++ b/public_html/lib/plugins/discussion/lang/pt-br/settings.php
@@ -7,8 +7,10 @@
* @author Marcus D'Alencar <marcus_dalen...@yahoo.com.br>
* @author Sergio Evandro Motta <ser...@cisne.com.br
* @author Juliano Marconi Lanigra <juliano.marc...@gmail.com>
+ * @author Oze Projetos <o...@oze.net.br>
*/
$lang['automatic'] = 'seção discussão em todas as páginas por
padrão';
+$lang['excluded_ns'] = 'lista de nomes para reverter a opção acima
(uma expressão regular, por exemplo, <code>/(playground|wiki)/</code> )';
$lang['allowguests'] = 'permitir comentários de usuários não
registrados';
$lang['showguests'] = 'permitir que usuários não registrados leiam
os comentários';
$lang['linkemail'] = 'adicionar link para e-mail dos usuários';
@@ -16,7 +18,6 @@ $lang['useavatar'] = 'usar imagens de avatar dos
usuários nos comen
$lang['urlfield'] = 'permitir usuários digitar uma URL';
$lang['addressfield'] = 'permitir usuários digitar um endereço
postal';
$lang['adminimport'] = 'permitir admins determinar todos os campos
para importação';
-$lang['usecocomment'] = 'usar coComment para seguir os comentários';
$lang['wikisyntaxok'] = 'permitir sintaxe wiki nos comentários';
$lang['subscribe'] = 'habilitar/desabilitar inscrição nos
comentários';
$lang['newestfirst'] = 'listar comentários mais novos primeiro';
@@ -29,3 +30,4 @@ $lang['threads_formposition_o_top'] = 'acima';
$lang['threads_formposition_o_bottom'] = 'abaixo';
$lang['visibilityButton'] = 'Habilitar botão para alterar a visibilidade
da seção da discussão';
$lang['moderatorgroups'] = 'Lista separada por vírgulas de grupos de
moderação (igual ao Gerenciador de níveis de permissão DokuWiki)';
+$lang['moderatorsnotify'] = 'Enviar e-mails de notificação dos novos
comentários aos moderadores';
diff --git a/public_html/lib/plugins/discussion/lang/ru/settings.php
b/public_html/lib/plugins/discussion/lang/ru/settings.php
index ab61374c..31dbe058 100644
--- a/public_html/lib/plugins/discussion/lang/ru/settings.php
+++ b/public_html/lib/plugins/discussion/lang/ru/settings.php
@@ -8,6 +8,7 @@
* @author JSBmanD <jsbm...@gmail.com>
* @author Aleksandr Selivanov <alexgear...@yandex.ru>
* @author Vitaly Filatenko <k...@hacktest.net>
+ * @author RainbowSpike <1...@2.ru>
*/
$lang['automatic'] = 'Добавлять обсуждение на каждую страницу по
умолчанию';
$lang['excluded_ns'] = 'Список пространств имён для отката
вариантов, указанных выше (регулярное выражение, например,
<code>/(playground|wiki)/</code> )';
@@ -18,7 +19,6 @@ $lang['useavatar'] = 'Использовать аватары для
$lang['urlfield'] = 'Разрешить пользователям вводить веб-адреса';
$lang['addressfield'] = 'Разрешить пользователям вводить адреса
электропочты';
$lang['adminimport'] = 'Разрешить администраторам устанавливать дату
комментария (для импорта)';
-$lang['usecocomment'] = 'Использовать отслеживание комментариев на
комментарии';
$lang['wikisyntaxok'] = 'Разрешить вики-синтаксис в комментариях';
$lang['subscribe'] = 'Влючить/отключить подписку на комментарии';
$lang['newestfirst'] = 'Новые комментарии отображать первыми';
@@ -31,3 +31,4 @@ $lang['threads_formposition_o_top'] = 'вверху';
$lang['threads_formposition_o_bottom'] = 'внизу';
$lang['visibilityButton'] = 'Включить кнопку для переключения видимости
секции обсуждений';
$lang['moderatorgroups'] = 'Разделённый запятыми список групп
модераторов (equal to DokuWiki-Manager permission level)';
+$lang['moderatorsnotify'] = 'Посылать модераторам е-майл о новых
комментариях?';
diff --git a/public_html/lib/plugins/discussion/lang/sl-si/lang.php
b/public_html/lib/plugins/discussion/lang/sl/lang.php
similarity index 100%
rename from public_html/lib/plugins/discussion/lang/sl-si/lang.php
rename to public_html/lib/plugins/discussion/lang/sl/lang.php
diff --git a/public_html/lib/plugins/discussion/lang/sv/confirmsubscribe.txt
b/public_html/lib/plugins/discussion/lang/sv/confirmsubscribe.txt
new file mode 100644
index 00000000..dc7f0f69
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/sv/confirmsubscribe.txt
@@ -0,0 +1,10 @@
+Hej!
+
+Du är på gång att prenumerera på kommentarer till sidan @PAGE@ på wikin
@TITLE@.
+
+För att bekräfta din prenumeration var god följ följande länk:
+@SUBSCRIBE@
+
+--
+Detta e-brev genererades av DokuWiki av
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/public_html/lib/plugins/discussion/lang/sv/lang.php
b/public_html/lib/plugins/discussion/lang/sv/lang.php
index 28e7f06b..558e7110 100644
--- a/public_html/lib/plugins/discussion/lang/sv/lang.php
+++ b/public_html/lib/plugins/discussion/lang/sv/lang.php
@@ -1,51 +1,41 @@
<?php
+
/**
- * Swedish language file
- *
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author Titorelli
+ *
+ * @author Titorelli
+ * @author Tor Härnqvist <t...@harnqvist.se>
*/
-
-// settings must be present and set appropriately for the language
-$lang['encoding'] = 'utf-8';
-$lang['direction'] = 'ltr';
-
-// for admin plugins, the menu prompt to be displayed in the admin menu
-// if set here, the plugin doesn't need to override the getMenuText() method
-
-// Titorelli's code
-$lang['menu'] = 'Moderera diskussioner';
-
-$lang['discussion'] = 'Diskussion';
-$lang['comment'] = 'Kommentar';
-$lang['comments'] = 'Kommentarer';
-$lang['nocomments'] = 'comments';
-
-$lang['url'] = 'Webbsida';
-$lang['address'] = 'Adress';
-$lang['date'] = 'Datum';
-$lang['btn_reply'] = 'Svara';
-$lang['btn_hide'] = 'Dölj';
-$lang['btn_show'] = 'Visa';
-$lang['wordblock'] = 'Er kommentar blockerades som spam.';
-$lang['mail_newcomment'] = 'Ny kommentar';
-
-$lang['reply'] = 'Svara';
-$lang['replies'] = 'Svar';
-$lang['newthread'] = 'Ny tråd';
-$lang['threads'] = 'Trådar';
-
-$lang['entercomment'] = 'Skriv din kommentar';
-$lang['wikisyntax'] = 'wikisyntax tillåten';
-$lang['older'] = 'Äldre diskussioner';
-$lang['newer'] = 'Nyare diskussioner';
-$lang['btn_change'] = 'Ändra';
-$lang['statuschanged'] = 'Diskussionsstatus ändrad';
-$lang['subscribe'] = 'Prenumerera på kommentarer';
-
-$lang['status'] = 'Status';
-$lang['off'] = 'av';
-$lang['open'] = 'öppen';
-$lang['closed'] = 'stängd';
-
-// vim:ts=4:sw=4:et:enc=utf-8:
+$lang['encoding'] = 'utf-8';
+$lang['direction'] = 'ltr';
+$lang['menu'] = 'Moderera diskussioner';
+$lang['discussion'] = 'Diskussion';
+$lang['comment'] = 'Kommentar';
+$lang['comments'] = 'Kommentarer';
+$lang['nocomments'] = 'comments';
+$lang['threads'] = 'Trådar';
+$lang['url'] = 'Webbsida';
+$lang['address'] = 'Adress';
+$lang['date'] = 'Datum';
+$lang['entercomment'] = 'Skriv din kommentar';
+$lang['wikisyntax'] = 'wikisyntax tillåten';
+$lang['older'] = 'Äldre diskussioner';
+$lang['newer'] = 'Nyare diskussioner';
+$lang['btn_reply'] = 'Svara';
+$lang['btn_hide'] = 'Dölj';
+$lang['btn_show'] = 'Visa';
+$lang['btn_change'] = 'Ändra';
+$lang['statuschanged'] = 'Diskussionsstatus ändrad';
+$lang['wordblock'] = 'Er kommentar blockerades som spam.';
+$lang['moderation'] = 'Din kommentar har lagts till och väntar på
godkännande.';
+$lang['mail_newcomment'] = 'Ny kommentar';
+$lang['subscribe'] = 'Prenumerera på kommentarer';
+$lang['noguests'] = 'Du kan lämna en kommentar om du är
inloggad.';
+$lang['status'] = 'Status';
+$lang['off'] = 'av';
+$lang['open'] = 'öppen';
+$lang['closed'] = 'stängd';
+$lang['reply'] = 'Svara';
+$lang['replies'] = 'Svar';
+$lang['newthread'] = 'Ny tråd';
+$lang['toggle_display'] = 'Göm/Visa';
diff --git a/public_html/lib/plugins/discussion/lang/sv/settings.php
b/public_html/lib/plugins/discussion/lang/sv/settings.php
new file mode 100644
index 00000000..a33007f8
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/sv/settings.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ * @author Tor Härnqvist <t...@harnqvist.se>
+ */
+$lang['automatic'] = 'Diskussionssektion på varje sida som
standard';
+$lang['excluded_ns'] = 'lista på namnrymder för att revertera
alternativet ovan (ett reguljärt uttryck t ex <code>/(playground|wiki)/</code>
)';
+$lang['allowguests'] = 'tillåt kommentarer av oregistrerade
besökare';
+$lang['showguests'] = 'tillåt besökare att läsa kommentarer';
+$lang['linkemail'] = 'Länka kommentarslämnarens namn med e-post';
+$lang['useavatar'] = 'använd avatar-användarbilder för
kommentarer';
+$lang['urlfield'] = 'tillåt användare att fylla i URL';
+$lang['addressfield'] = 'tillåt användare att fylla i postadress';
+$lang['adminimport'] = 'tillåt administratörer att välja alla fält
för importering';
+$lang['wikisyntaxok'] = 'tillåt wiki-syntax i kommentarer';
+$lang['subscribe'] = 'aktivera/avaktivera prenumeration på
kommentarer';
+$lang['newestfirst'] = 'lista senaste kommentarer först';
+$lang['moderate'] = 'godkänn nya kommentarer';
+$lang['usethreading'] = 'tillåt trådning av kommentarer';
+$lang['userealname'] = 'visa riktigt namn istället för användarna på
registrerade wiki-användare';
+$lang['threads_formposition'] = 'placera formuläret för nya diskussioner
visat med <code>{{threads> }}</code> syntax';
+$lang['threads_formposition_o_off'] = 'av';
+$lang['threads_formposition_o_top'] = 'högst upp';
+$lang['threads_formposition_o_bottom'] = 'längst ner';
+$lang['visibilityButton'] = 'Aktivera knapp för att slå på/av visning av
kommentarssektionen';
+$lang['moderatorgroups'] = 'Kommaseparerad lista på moderatorsgrupper
(motsvarande behörighetsnivå för DokuWiki-manager)';
+$lang['moderatorsnotify'] = 'Skicka e-brev till moderatorer för
notifiering om nya kommentarer';
diff --git a/public_html/lib/plugins/discussion/lang/sv/subscribermail.txt
b/public_html/lib/plugins/discussion/lang/sv/subscribermail.txt
new file mode 100644
index 00000000..46523758
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/sv/subscribermail.txt
@@ -0,0 +1,19 @@
+Hej!
+
+En ny kommentar har lagt till på sidan @PAGE@ på wikin @TITLE@.
+
+Datum: @DATE@
+Namn: @NAME@
+URL: @COMMENTURL@
+
+Kommentar:
+--------------------------------------------------------
+@TEXT@
+--------------------------------------------------------
+
+För att sluta prenumerera klicka på följande länk:
+@UNSUBSCRIBE@
+
+--
+Detta e-brev genererades av DokuWiki av
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/public_html/lib/plugins/discussion/lang/tr/lang.php
b/public_html/lib/plugins/discussion/lang/tr/lang.php
new file mode 100644
index 00000000..5f05d57b
--- /dev/null
+++ b/public_html/lib/plugins/discussion/lang/tr/lang.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Turkish language file
+ *
+ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Esther Brunner <wikides...@gmail.com>
+ * @author iDo <ilove...@gmail.com>
+ * Translation İlker R. Kapaç <iri...@gmail.com>
+ */
+
+// settings must be present and set appropriately for the language
+$lang['encoding'] = 'utf-8';
+$lang['direction'] = 'ltr';
+
+// for admin plugins, the menu prompt to be displayed in the admin menu
+// if set here, the plugin doesn't need to override the getMenuText() method
+$lang['menu'] = 'Tartışmaları Yönet';
+
+$lang['discussion'] = 'Tartışma';
+$lang['comment'] = 'Yorum';
+$lang['comments'] = 'Yorumlar';
+$lang['nocomments'] = 'Yorumlar';
+$lang['url'] = 'İnternet sitesi';
+$lang['address'] = 'Adres';
+$lang['date'] = 'Tarih';
+$lang['entercomment'] = 'Yorumunuzu girin';
+$lang['wikisyntax'] = 'Wiki sözdizimi kullanabilirsiniz';
+$lang['older'] = 'Eski tartışmalar';
+$lang['newer'] = 'Yeni tartışmalar';
+$lang['btn_reply'] = 'Yanıtla';
+$lang['btn_hide'] = 'Gizle';
+$lang['btn_show'] = 'Göster';
+$lang['btn_change'] = 'Değiştir';
+$lang['statuschanged'] = 'Tartışma durumu değiştirildi';
+$lang['wordblock'] = 'Yorumunuz spam olarak engellendi.';
+$lang['moderation'] = 'Yorumunuz kaydedildi. Yayınlanması için onay
bekliyor';
+$lang['mail_newcomment'] = 'Yeni Yorum';
+$lang['subscribe'] = 'Tartışmaya abone ol';
+$lang['noguests'] = 'Yorum yazabilmek için sisteme giriş yapmış
olmalısınız.';
+
+$lang['status'] = 'Durum';
+$lang['off'] = 'kapalı';
+$lang['open'] = 'açık';
+$lang['closed'] = 'kapatılmış';
+
+$lang['reply'] = 'Yanıt';
+$lang['replies'] = 'Yanıtlar';
+$lang['newthread'] = 'Yeni tartışma sayfası';
+$lang['toggle_display'] = 'Tartışmayı Gizle/Göster';
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/public_html/lib/plugins/discussion/lang/zh-tw/settings.php
b/public_html/lib/plugins/discussion/lang/zh-tw/settings.php
index dca937b5..5f65cfe6 100644
--- a/public_html/lib/plugins/discussion/lang/zh-tw/settings.php
+++ b/public_html/lib/plugins/discussion/lang/zh-tw/settings.php
@@ -15,7 +15,6 @@ $lang['useavatar'] = '意見使用 avatar 使用者圖像';
$lang['urlfield'] = '允許使用者輸入自己的網站網址';
$lang['addressfield'] = '允許使用者輸入自己的通信地址';
$lang['adminimport'] = '允許管理者設定意見發表日期 (方便匯入使用)';
-$lang['usecocomment'] = '使用 coComment 評論追蹤功能';
$lang['wikisyntaxok'] = '意見允許使用維基語法';
$lang['subscribe'] = '允許訂閱意見';
$lang['newestfirst'] = '新意見置前';
diff --git a/public_html/lib/plugins/discussion/lang/zh/lang.php
b/public_html/lib/plugins/discussion/lang/zh/lang.php
index e33eda7d..b15a0b51 100644
--- a/public_html/lib/plugins/discussion/lang/zh/lang.php
+++ b/public_html/lib/plugins/discussion/lang/zh/lang.php
@@ -1,49 +1,41 @@
<?php
+
/**
- * Chinese Simplified language file
- *
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author ZDYX <zhangduyixi...@gmail.com>
+ *
+ * @author ZDYX <zhangduyixi...@gmail.com>
+ * @author PlaneV <plan...@gmail.com>
*/
-
-// settings must be present and set appropriately for the language
-$lang['encoding'] = 'utf-8';
-$lang['direction'] = 'ltr';
-
-// for admin plugins, the menu prompt to be displayed in the admin menu
-// if set here, the plugin doesn't need to override the getMenuText() method
-$lang['menu'] = '待审核的评论';
-
-$lang['discussion'] = '评论'; //新版已经修正TOC 问题，翻译之。
-$lang['comment'] = '评论';
-$lang['comments'] = '评论';
-$lang['nocomments'] = '无评论';
-$lang['url'] = '个人主页';
-$lang['address'] = '通信地址';
-$lang['date'] = '评论日期';
-$lang['entercomment'] = '请输入您的评论';
-$lang['wikisyntax'] = '可以使用维基语法';
-$lang['older'] = '更早的评论';
-$lang['newer'] = '更晚的评论';
-$lang['btn_reply'] = '回复';
-$lang['btn_hide'] = '隐藏';
-$lang['btn_show'] = '显示';
-$lang['btn_change'] = '修改';
-$lang['statuschanged'] = '讨论状态变化了';
-$lang['wordblock'] = '您的评论由于类似垃圾评论而被阻止发表。';
-$lang['moderation'] = '你的评论已添加并且等待审核。';
-$lang['mail_newcomment'] = '新评论';
-$lang['subscribe'] = '订阅评论';
-$lang['noguests'] = '你需要登录发表评论。';
-
-$lang['status'] = '状态';
-$lang['off'] = '关';
-$lang['open'] = '开';
-$lang['closed'] = '关闭';
-
-$lang['reply'] = '条回复';
-$lang['replies'] = '条回复';
-$lang['newthread'] = '新讨论主题';
-$lang['toggle_display'] = '隐藏/显示评论';
-
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+$lang['encoding'] = 'utf-8';
+$lang['direction'] = 'ltr';
+$lang['menu'] = '待审核的评论';
+$lang['discussion'] = '评论';
+$lang['comment'] = '评论';
+$lang['comments'] = '评论';
+$lang['nocomments'] = '无评论';
+$lang['threads'] = '评论';
+$lang['url'] = '个人主页';
+$lang['address'] = '通信地址';
+$lang['date'] = '评论日期';
+$lang['entercomment'] = '请输入您的评论';
+$lang['wikisyntax'] = '可以使用维基语法';
+$lang['older'] = '更早的评论';
+$lang['newer'] = '更晚的评论';
+$lang['btn_reply'] = '回复';
+$lang['btn_hide'] = '隐藏';
+$lang['btn_show'] = '显示';
+$lang['btn_change'] = '修改';
+$lang['statuschanged'] = '讨论状态变化了';
+$lang['wordblock'] = '您的评论由于类似垃圾评论而被阻止发表。';
+$lang['moderation'] = '你的评论已添加并且等待审核。';
+$lang['mail_newcomment'] = '新评论';
+$lang['subscribe'] = '订阅评论';
+$lang['noguests'] = '你需要登录发表评论。';
+$lang['status'] = '状态';
+$lang['off'] = '关';
+$lang['open'] = '开';
+$lang['closed'] = '关闭';
+$lang['reply'] = '条回复';
+$lang['replies'] = '条回复';
+$lang['newthread'] = '新讨论主题';
+$lang['toggle_display'] = '隐藏/显示评论';
diff --git a/public_html/lib/plugins/discussion/lang/zh/settings.php
b/public_html/lib/plugins/discussion/lang/zh/settings.php
index 8aeeea46..b2c0399c 100644
--- a/public_html/lib/plugins/discussion/lang/zh/settings.php
+++ b/public_html/lib/plugins/discussion/lang/zh/settings.php
@@ -1,36 +1,30 @@
<?php
+
/**
- * Chinese Simplified language file
- *
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author ZDYX <zhangduyixi...@gmail.com>
+ *
+ * @author ZDYX <zhangduyixi...@gmail.com>
+ * @author PlaneV <plan...@gmail.com>
*/
-
-// for the configuration manager
-$lang['automatic'] = '默认在页面上显示讨论部分';
-$lang['allowguests'] = '允许未注册的用户发表评论';
-$lang['showguests'] = '允许未注册的用户查看评论';
-$lang['linkemail'] = '将评论者的姓名链接到其 e-mail 地址';
-$lang['useavatar'] = '在评论中显示 avatar 用户头像';
-$lang['urlfield'] = '允许用户输入个人主页 URL';
-$lang['addressfield'] = '允许用户输入通信地址';
-$lang['adminimport'] = '允许管理员设置评论日期（方便导出）';
-$lang['usecocomment'] = '使用 coComment 评论跟踪服务';
-$lang['wikisyntaxok'] = '在评论中允许使用维基语法';
-$lang['subscribe'] = '禁止和启用，订阅评论';
-$lang['newestfirst'] = '先显示最新的评论';
-$lang['moderate'] = '审核新的评论';
-
-$lang['usethreading'] = '允许嵌套评论';
-$lang['userealname'] = '对注册维基用户，显示真实姓名';
-
-$lang['threads_formposition'] = '新的的主题的位置';
-$lang['threads_formposition_o_off'] = 'off'; //没搞懂什么意思
-$lang['threads_formposition_o_top'] = '上面';
+$lang['automatic'] = '默认在页面上显示讨论部分';
+$lang['excluded_ns'] = '恢复上述选项的命名空间(正则表达式 如：
<code>/(playground|wiki)/</code> )';
+$lang['allowguests'] = '允许未注册的用户发表评论';
+$lang['showguests'] = '允许未注册的用户查看评论';
+$lang['linkemail'] = '将评论者的姓名链接到其 e-mail 地址';
+$lang['useavatar'] = '在评论中显示 avatar 用户头像';
+$lang['urlfield'] = '允许用户输入个人主页 URL';
+$lang['addressfield'] = '允许用户输入通信地址';
+$lang['adminimport'] = '允许管理员设置评论日期（方便导出）';
+$lang['wikisyntaxok'] = '在评论中允许使用维基语法';
+$lang['subscribe'] = '禁止和启用，订阅评论';
+$lang['newestfirst'] = '先显示最新的评论';
+$lang['moderate'] = '审核新的评论';
+$lang['usethreading'] = '允许嵌套评论';
+$lang['userealname'] = '对注册维基用户，显示真实姓名';
+$lang['threads_formposition'] = '新的的主题的位置';
+$lang['threads_formposition_o_off'] = 'off';
+$lang['threads_formposition_o_top'] = '上面';
$lang['threads_formposition_o_bottom'] = '下面';
-
-$lang['visibilityButton'] = '使用用切换显示/隐藏评论部分的按钮';
-
-$lang['moderatorgroups'] = '逗号(,)分隔的管理员组列表（等同于 DokuWiki-管理员权限）';
-
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+$lang['visibilityButton'] = '使用用切换显示/隐藏评论部分的按钮';
+$lang['moderatorgroups'] = '逗号(,)分隔的管理员组列表（等同于 DokuWiki-管理员权限）';
+$lang['moderatorsnotify'] = '有新评论时发送邮件通知版主';
diff --git a/public_html/lib/plugins/discussion/plugin.info.txt
b/public_html/lib/plugins/discussion/plugin.info.txt
index c4c7d116..c833c9f9 100644
--- a/public_html/lib/plugins/discussion/plugin.info.txt
+++ b/public_html/lib/plugins/discussion/plugin.info.txt
@@ -1,7 +1,7 @@
base discussion
-author Michael Hamann, Gina Häussge, Christopher Smith, Michael Klier, Esther
Brunner, Matthias Schulte
+author Michael Hamann, Gerrit Uitslag, Gina Häussge, Christopher Smith,
Michael Klier, Esther Brunner, Matthias Schulte
email mich...@content-space.de
-date 2014-11-18
+date 2017-08-24
name discussion plugin
desc Provides discussion funtionality for wiki pages
url https://dokuwiki.org/plugin:discussion
diff --git a/public_html/lib/plugins/discussion/script.js
b/public_html/lib/plugins/discussion/script.js
index cd583d49..59d9366e 100644
--- a/public_html/lib/plugins/discussion/script.js
+++ b/public_html/lib/plugins/discussion/script.js
@@ -60,7 +60,7 @@ function discussion_ajax_preview() {
$preview.hide();
return;
}
- $preview.html('<img src="'+DOKU_BASE+'/lib/images/throbber.gif" />');
+ $preview.html('<img src="'+DOKU_BASE+'lib/images/throbber.gif" />');
$preview.show();
jQuery.post(DOKU_BASE + 'lib/exe/ajax.php',
@@ -76,6 +76,7 @@ function discussion_ajax_preview() {
$preview.html(data);
$preview.show();
$preview.css('visibility', 'visible');
+ $preview.css('display', 'inline');
}, 'html');
}
diff --git a/public_html/lib/plugins/discussion/style.css
b/public_html/lib/plugins/discussion/style.css
index 6a3d0774..0dc1af2a 100644
--- a/public_html/lib/plugins/discussion/style.css
+++ b/public_html/lib/plugins/discussion/style.css
@@ -13,6 +13,7 @@ div.dokuwiki div#discussion__comment_preview {
padding: 1em 0;
margin-top: 1em;
visibility: hidden;
+ display: none;
}
div.dokuwiki div.comment_preview {
@@ -65,6 +66,11 @@ div.dokuwiki .comment_head abbr.published {
padding: 1px 0 1px 16px;
}
+div.dokuwiki .comment_head abbr.updated {
+ background: transparent url(images/updated.gif) 0 1px no-repeat;
+ padding: 1px 0 1px 16px;
+}
+
div.dokuwiki .comment_body {
padding-top: 0.5em;
padding-bottom: 0.5em;
diff --git a/public_html/lib/plugins/discussion/syntax/comments.php
b/public_html/lib/plugins/discussion/syntax/comments.php
index fd446c7c..1f6295e1 100644
--- a/public_html/lib/plugins/discussion/syntax/comments.php
+++ b/public_html/lib/plugins/discussion/syntax/comments.php
@@ -57,7 +57,7 @@ class syntax_plugin_discussion_comments extends
DokuWiki_Syntax_Plugin {
* @param Doku_Handler $handler The Doku_Handler object
* @return array Return an array with all data you want to use in render
*/
- function handle($match, $state, $pos, &$handler) {
+ function handle($match, $state, $pos, Doku_Handler $handler) {
// strip markup
$match = substr($match, 12, -2);
--
