diff options
| author | Mario <mario@mariovavti.com> | 2018-08-27 10:00:50 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-08-27 10:00:50 +0200 |
| commit | 95f870f1b41ff243a03617b368c8606354de8273 (patch) | |
| tree | 60abd431a446eafec85eaeda5df45debfc101b97 | |
| parent | c250de7dae3890880568e5df749a089f8cebc909 (diff) | |
| parent | f5f6ec3d71acb3e0488386819d5060e59331ec23 (diff) | |
| download | volse-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
| -rw-r--r-- | Zotlabs/Lib/NativeWikiPage.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Widget/Wiki_page_history.php | 5 | ||||
| -rw-r--r-- | view/tpl/nwiki_page_history.tpl | 14 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 4 |
5 files changed, 19 insertions, 11 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') )); } diff --git a/view/tpl/nwiki_page_history.tpl b/view/tpl/nwiki_page_history.tpl index b1c6c9284..6926cca2d 100644 --- a/view/tpl/nwiki_page_history.tpl +++ b/view/tpl/nwiki_page_history.tpl @@ -43,17 +43,17 @@ {{foreach $pageHistory as $commit}} <tr class="wikis-index-row"><td> <table id="rev-{{$commit.revision}}" onclick="$('#details-{{$commit.revision}}').show()" style="width: 100%;"> - <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td> + <tr><td width="10%">{{$date_lbl}}</td><td width="70%">{{$commit.date}}</td> <td rowspan="3" width="20%" align="right"> - {{if $permsWrite}} - <button id="revert-{{$commit.revision}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.revision}}')">Revert</button> + {{if $permsWrite}} + <button id="revert-{{$commit.revision}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.revision}}')">{{$revert_btn}}</button> <br><br> - {{/if}} - <button id="compare-{{$commit.revision}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.revision}}')">Compare</button> + {{/if}} + <button id="compare-{{$commit.revision}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.revision}}')">{{$compare_btn}}</button> </td></tr> <tr><td>{{$name_lbl}}</td><td>{{$commit.name}}</td></tr> <tr><td>{{$msg_label}}</td><td>{{$commit.title}}</td></tr> </table> </td></tr> - {{/foreach}} -</table> + {{/foreach}} +</table>
\ No newline at end of file diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 6ca4b0c77..0f725749f 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -42,8 +42,8 @@ <div id="wiki-content-container" class="section-content-wrapper"> <ul class="nav nav-tabs" id="wiki-nav-tabs"> <li class="nav-item" id="edit-pane-tab"><a class="nav-link" data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li> - <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li> - <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li> + <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">{{$view_lbl}}</a></li> + <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">{{$history_lbl}}</a></li> </ul> <div class="tab-content" id="wiki-page-tabs"> <div id="edit-pane" class="tab-pane"> |