Merge branch 's9_MDL-27098_filemanager_strings_20' of git://github.co…

…m/dongsheng/moodle into MOODLE_20_STABLE
moodle · Apr 11, 2011 · 37efb4f · 37efb4f
2 parents 8fa13d1 + 81bd229
commit 37efb4f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/lang/en/repository.php b/lang/en/repository.php
@@ -123,6 +123,7 @@
 $string['manage'] = 'Manage repositories';
 $string['manageurl'] = 'Manage';
 $string['manageuserrepository'] = 'Manage individual repository';
+$string['moving'] = 'Moving';
 $string['noenter'] = 'Nothing entered';
 $string['nofilesattached'] = 'No files attached';
 $string['nofilesavailable'] = 'No files available';

diff --git a/lib/form/filemanager.js b/lib/form/filemanager.js
@@ -636,7 +636,7 @@ M.form_filemanager.init = function(Y, options) {
                     dialog = Y.one('#fm-move-dlg');
                 }
 
-                dialog.set('innerHTML', '<div class="hd">Moving</div><div class="bd"><div id="fm-move-div">'+M.str.repository.nopathselected+'</div><div id="fm-tree"></div></div>');
+                dialog.set('innerHTML', '<div class="hd">'+M.str.repository.moving+'</div><div class="bd"><div id="fm-move-div">'+M.str.repository.nopathselected+'</div><div id="fm-tree"></div></div>');
 
                 this.movefile_dialog = new YAHOO.widget.Dialog("fm-move-dlg", {
                      width : "600px",
@@ -717,7 +717,7 @@ M.form_filemanager.init = function(Y, options) {
                     var rootNode = treeview.getRoot();
                     treeview.setDynamicLoad(loadDataForNode);
                     treeview.removeChildren(rootNode);
-                    var textnode = {label: "Files", path: '/'};
+                    var textnode = {label: M.str.moodle.files, path: '/'};
                     var tmpNode = new YAHOO.widget.TextNode(textnode, rootNode, true);
                     treeview.draw();
                 }, this, true);

diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php
@@ -246,7 +246,7 @@ function form_filemanager_render($options) {
 
     $html = '';
     $options = $fm->options;
-    $straddfile  = get_string('add', 'repository') . '...';
+    $straddfile  = get_string('addfile', 'repository');
     $strmakedir  = get_string('makeafolder', 'moodle');
     $strdownload = get_string('downloadfolder', 'repository');
     $strloading  = get_string('loading', 'repository');
@@ -280,9 +280,9 @@ function form_filemanager_render($options) {
 <div id="filemanager-wrapper-{$client_id}" style="display:none">
     <div class="fm-breadcrumb" id="fm-path-{$client_id}"></div>
     <div class="filemanager-toolbar">
-        <input type="button" class="fm-btn-add" id="btnadd-{$client_id}" onclick="return false" value=" {$straddfile}" />
-        <input type="button" class="fm-btn-mkdir" id="btncrt-{$client_id}" onclick="return false" value=" $strmakedir" />
-        <input type="button" class="fm-btn-download" id="btndwn-{$client_id}" onclick="return false" {$extra} value=" $strdownload" />
+        <input type="button" class="fm-btn-add" id="btnadd-{$client_id}" onclick="return false" value="{$straddfile}" />
+        <input type="button" class="fm-btn-mkdir" id="btncrt-{$client_id}" onclick="return false" value="{$strmakedir}" />
+        <input type="button" class="fm-btn-download" id="btndwn-{$client_id}" onclick="return false" {$extra} value="{$strdownload}" />
         <span> $maxsize </span>
     </div>
     <div class="filemanager-container" id="filemanager-{$client_id}">
@@ -311,7 +311,8 @@ function form_filemanager_render($options) {
              array('zip', 'editor'), array('unzip', 'moodle'), array('rename', 'moodle'), array('delete', 'moodle'),
              array('cannotdeletefile', 'error'), array('confirmdeletefile', 'repository'),
              array('nopathselected', 'repository'), array('popupblockeddownload', 'repository'),
-             array('draftareanofiles', 'repository'), array('path', 'moodle'), array('setmainfile', 'repository')
+             array('draftareanofiles', 'repository'), array('path', 'moodle'), array('setmainfile', 'repository'),
+             array('moving', 'repository'), array('files', 'moodle')
         )
     );
     $PAGE->requires->js_module($module);