Skip to content

Commit ea10a8e

Browse files
committed
fixed output
1 parent 42cc729 commit ea10a8e

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

lang/en/lang.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
$lang['remotedelfail'] = 'remote delete failed:';
4949
$lang['skipped'] = 'skipped:';
5050

51+
$lang['js']['list'] = 'A list of files that differ between your local and the remote wiki is shown below. You need to decide which revisions you want to keep.'; #from list.txt
52+
5153
$lang['js']['file'] = 'Page or Media File';
5254
$lang['js']['local'] = 'Local Wiki';
5355
$lang['js']['remote'] = 'Remote Wiki';
@@ -60,7 +62,7 @@
6062
$lang['js']['pulldel'] = 'Delete local revision.';
6163
$lang['js']['keep'] = 'Skip this file and keep both revisions as is.';
6264

63-
$lang['js']['insync'] = 'Both wiki namespaces are in sync. Nothing to do.';
65+
$lang['js']['insync'] = 'There were no differences found between your local wiki and the remote wiki. No need to synchronize.'; #from nochange.txt
6466
$lang['js']['tosync'] = 'Syncing %d files…';
6567
$lang['js']['btn_done'] = 'Done';
6668
$lang['js']['btn_start'] = 'Start';

sync.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ jQuery(function () {
2222
finishbutton();
2323
return;
2424
}
25+
log(LANG.plugins.sync.list);
2526

2627
var $table = jQuery('<table>');
2728
$table.append(headers());
2829
jQuery.each(data.list, function (type, items) {
2930
jQuery.each(items, function (id, item) {
30-
$table.append(tr(type, id, item));
31+
$table.append(tr(parseInt(type, 10), id, item));
3132
});
3233
});
3334
$output.append($table);
@@ -97,6 +98,7 @@ jQuery(function () {
9798

9899
$tr.find('.dir').append(dir(item));
99100

101+
console.log('type', type);
100102
if (type === 1) {
101103
var url = DOKU_BASE + 'lib/plugins/sync/diff.php?no=' + SYNC_DATA.profile + '&id=' + encodeURIComponent(id);
102104
var a = jQuery('<a>');
@@ -287,7 +289,7 @@ jQuery(function () {
287289
*/
288290
function log(log) {
289291
var $p = jQuery('<p>');
290-
$p.text = log;
292+
$p.text(log);
291293
$output.append($p);
292294
}
293295

0 commit comments

Comments
 (0)