aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-08-27 10:00:50 +0200
committerMario <mario@mariovavti.com>2018-08-27 10:00:50 +0200
commit95f870f1b41ff243a03617b368c8606354de8273 (patch)
tree60abd431a446eafec85eaeda5df45debfc101b97 /Zotlabs
parentc250de7dae3890880568e5df749a089f8cebc909 (diff)
parentf5f6ec3d71acb3e0488386819d5060e59331ec23 (diff)
downloadvolse-hubzilla-95f870f1b41ff243a03617b368c8606354de8273.tar.gz
volse-hubzilla-95f870f1b41ff243a03617b368c8606354de8273.tar.bz2
volse-hubzilla-95f870f1b41ff243a03617b368c8606354de8273.zip
Merge branch 'dev' into 'dev'
Add translation to missed strings in Wiki See merge request hubzilla/core!1264
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/NativeWikiPage.php5
-rw-r--r--Zotlabs/Module/Wiki.php2
-rw-r--r--Zotlabs/Widget/Wiki_page_history.php5
3 files changed, 10 insertions, 2 deletions
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index 919c51276..d4875bbaf 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -556,7 +556,10 @@ class NativeWikiPage {
'$pageHistory' => $pageHistory['history'],
'$permsWrite' => $arr['permsWrite'],
'$name_lbl' => t('Name'),
- '$msg_label' => t('Message','wiki_history')
+ '$msg_label' => t('Message','wiki_history'),
+ '$date_lbl' => t('Date'),
+ '$revert_btn' => t('Revert'),
+ '$compare_btn' => t('Compare')
));
}
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 322a3933c..25ecb6a6a 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -384,6 +384,8 @@ class Wiki extends \Zotlabs\Web\Controller {
'$modalerrorlist' => t('Error getting album list'),
'$modalerrorlink' => t('Error getting photo link'),
'$modalerroralbum' => t('Error getting album'),
+ '$view_lbl' => t('View'),
+ '$history_lbl' => t('History')
));
if($p['pageMimeType'] === 'text/markdown')
diff --git a/Zotlabs/Widget/Wiki_page_history.php b/Zotlabs/Widget/Wiki_page_history.php
index dcec9a037..dbb322dc3 100644
--- a/Zotlabs/Widget/Wiki_page_history.php
+++ b/Zotlabs/Widget/Wiki_page_history.php
@@ -20,7 +20,10 @@ class Wiki_page_history {
'$pageHistory' => $pageHistory['history'],
'$permsWrite' => $arr['permsWrite'],
'$name_lbl' => t('Name'),
- '$msg_label' => t('Message','wiki_history')
+ '$msg_label' => t('Message','wiki_history'),
+ '$date_lbl' => t('Date'),
+ '$revert_btn' => t('Revert'),
+ '$compare_btn' => t('Compare')
));
}