From 614d18d26c8f9e2df2c9db98d5f6f72a0fc5a8e5 Mon Sep 17 00:00:00 2001
From: Petr Skoda <skodak@moodle.org>
Date: Sun, 4 Jul 2010 12:52:10 +0000
Subject: [PATCH] MDL-22984 using standard plugin name string for repositories

AMOS BEGIN
 MOV [repositoryname,repository_alfresco],[pluginname,repository_alfresco]
 MOV [repositoryname,repository_boxnet],[pluginname,repository_boxnet]
 MOV [repositoryname,repository_dropbox],[pluginname,repository_dropbox]
 MOV [repositoryname,repository_filesystem],[pluginname,repository_filesystem]
 MOV [repositoryname,repository_flickr],[pluginname,repository_flickr]
 MOV [repositoryname,repository_flickr_public],[pluginname,repository_flickr_public]
 MOV [repositoryname,repository_googledocs],[pluginname,repository_googledocs]
 MOV [repositoryname,repository_local],[pluginname,repository_local]
 MOV [repositoryname,repository_merlot],[pluginname,repository_merlot]
 MOV [repositoryname,repository_picasa],[pluginname,repository_picasa]
 MOV [repositoryname,repository_recent],[pluginname,repository_recent]
 MOV [repositoryname,repository_s3],[pluginname,repository_s3]
 MOV [repositoryname,repository_upload],[pluginname,repository_upload]
 MOV [repositoryname,repository_url],[pluginname,repository_url]
 MOV [repositoryname,repository_user],[pluginname,repository_user]
 MOV [repositoryname,repository_webdav],[pluginname,repository_webdav]
 MOV [repositoryname,repository_wikimedia],[pluginname,repository_wikimedia]
 MOV [repositoryname,repository_youtube],[pluginname,repository_youtube]
AMOS END
---
 lib/accesslib.php                                             | 2 +-
 lib/adminlib.php                                              | 2 +-
 repository/alfresco/lang/en/repository_alfresco.php           | 2 +-
 repository/alfresco/repository.class.php                      | 2 +-
 repository/boxnet/lang/en/repository_boxnet.php               | 2 +-
 repository/dropbox/lang/en/repository_dropbox.php             | 2 +-
 repository/filesystem/lang/en/repository_filesystem.php       | 2 +-
 repository/flickr/lang/en/repository_flickr.php               | 2 +-
 repository/flickr_public/lang/en/repository_flickr_public.php | 2 +-
 repository/flickr_public/repository.class.php                 | 2 +-
 repository/googledocs/lang/en/repository_googledocs.php       | 2 +-
 repository/googledocs/repository.class.php                    | 2 +-
 repository/lib.php                                            | 4 ++--
 repository/local/lang/en/repository_local.php                 | 2 +-
 repository/local/repository.class.php                         | 2 +-
 repository/merlot/lang/en/repository_merlot.php               | 2 +-
 repository/picasa/lang/en/repository_picasa.php               | 2 +-
 repository/picasa/repository.class.php                        | 2 +-
 repository/recent/lang/en/repository_recent.php               | 2 +-
 repository/recent/repository.class.php                        | 2 +-
 repository/s3/lang/en/repository_s3.php                       | 2 +-
 repository/upload/lang/en/repository_upload.php               | 2 +-
 repository/upload/repository.class.php                        | 2 +-
 repository/url/lang/en/repository_url.php                     | 2 +-
 repository/url/repository.class.php                           | 2 +-
 repository/user/lang/en/repository_user.php                   | 2 +-
 repository/webdav/lang/en/repository_webdav.php               | 2 +-
 repository/wikimedia/lang/en/repository_wikimedia.php         | 2 +-
 repository/youtube/lang/en/repository_youtube.php             | 2 +-
 29 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 1f989709159..a10c53c77d0 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -4053,7 +4053,7 @@ function get_component_string($component, $contextlevel) {
                 $langname = str_replace('/', '_', $component);
                 $string = get_string('local');
             } else if (preg_match('|^repository|', $component)) {
-                $string = get_string('repository', 'repository').': '.get_string('repositoryname', $component);
+                $string = get_string('repository', 'repository').': '.get_string('pluginname', $component);
             } else if (preg_match('|^report|', $component)) {
                 $string = get_string('reports');
             } else {
diff --git a/lib/adminlib.php b/lib/adminlib.php
index 92fa40bb4a7..63643f46178 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -6541,7 +6541,7 @@ class admin_setting_managerepository extends admin_setting {
                 // Check that it has not already been listed
                 if (!in_array($plugin, $alreadyplugins)) {
                     $select = new single_select($this->repository_action_url($plugin, 'repos'), 'action', $actionchoicesfornew, 'delete', null, 'applyto' . basename($plugin));
-                    $table->data[] = array(get_string('repositoryname', 'repository_'.$plugin), $OUTPUT->render($select), '', '');
+                    $table->data[] = array(get_string('pluginname', 'repository_'.$plugin), $OUTPUT->render($select), '', '');
                 }
             }
         }
diff --git a/repository/alfresco/lang/en/repository_alfresco.php b/repository/alfresco/lang/en/repository_alfresco.php
index d19e1c13a08..ef90724c3b6 100644
--- a/repository/alfresco/lang/en/repository_alfresco.php
+++ b/repository/alfresco/lang/en/repository_alfresco.php
@@ -30,6 +30,6 @@ $string['configplugin'] = 'Alfresco configuration';
 $string['notitle'] = 'notitle';
 $string['password'] = 'Password';
 $string['repositorydesc'] = 'A plug-in for Alfresco CMS';
-$string['repositoryname'] = 'Alfresco repository';
+$string['pluginname'] = 'Alfresco repository';
 $string['soapmustbeenabled'] = 'SOAP extension must be enabled for alfresco plugin';
 $string['username'] = 'User name';
diff --git a/repository/alfresco/repository.class.php b/repository/alfresco/repository.class.php
index 9a59fc02e17..c3fc791095c 100755
--- a/repository/alfresco/repository.class.php
+++ b/repository/alfresco/repository.class.php
@@ -144,7 +144,7 @@ class repository_alfresco extends repository {
             $ret['manage'] = $matches[1].'faces/jsp/dashboards/container.jsp';
         }
 
-        $ret['path'] = array(array('name'=>get_string('repositoryname', 'repository_alfresco'), 'path'=>''));
+        $ret['path'] = array(array('name'=>get_string('pluginname', 'repository_alfresco'), 'path'=>''));
 
         try {
             if (empty($uuid)) {
diff --git a/repository/boxnet/lang/en/repository_boxnet.php b/repository/boxnet/lang/en/repository_boxnet.php
index e6a519a5701..8d193090588 100644
--- a/repository/boxnet/lang/en/repository_boxnet.php
+++ b/repository/boxnet/lang/en/repository_boxnet.php
@@ -31,7 +31,7 @@ $string['invalidpassword'] = 'Invalid password';
 $string['nullfilelist'] = 'There are no files in this repository';
 $string['password'] = 'Password';
 $string['repositorydesc'] = 'Repository on Box.net';
-$string['repositoryname'] = 'Box.net';
+$string['pluginname'] = 'Box.net';
 $string['saved'] = 'Box.net data saved';
 $string['shareurl'] = 'Share URL';
 $string['username'] = 'Username for Box.net';
diff --git a/repository/dropbox/lang/en/repository_dropbox.php b/repository/dropbox/lang/en/repository_dropbox.php
index 4bfec17d066..f8f62398328 100755
--- a/repository/dropbox/lang/en/repository_dropbox.php
+++ b/repository/dropbox/lang/en/repository_dropbox.php
@@ -27,7 +27,7 @@ $string['configplugin'] = 'Dropbox configuration';
 $string['notitle'] = 'notitle';
 $string['remember'] = 'Remember me';
 $string['repositorydesc'] = '';
-$string['repositoryname'] = 'Dropbox';
+$string['pluginname'] = 'Dropbox';
 $string['apikey'] = 'Dropbox API Key';
 $string['secret'] = 'Dropbox Secret';
 $string['instruction'] = 'You can get your API Key and secret from <a href="http://www.dropbox.com/developers/apps">Dropbox developers</a>';
diff --git a/repository/filesystem/lang/en/repository_filesystem.php b/repository/filesystem/lang/en/repository_filesystem.php
index 7de75ffea8b..ef7cc8b703f 100644
--- a/repository/filesystem/lang/en/repository_filesystem.php
+++ b/repository/filesystem/lang/en/repository_filesystem.php
@@ -32,4 +32,4 @@ $string['invalidpath'] = 'Invalid root path';
 $string['path'] = 'Select a subdirectory';
 $string['nosubdir'] = 'You need to create at least one folder inside the <b>{$a}</b> directory so you can select it here.';
 $string['repositorydesc'] = 'Create repository from local directory';
-$string['repositoryname'] = 'File system';
+$string['pluginname'] = 'File system';
diff --git a/repository/flickr/lang/en/repository_flickr.php b/repository/flickr/lang/en/repository_flickr.php
index 507a4670c42..d49ae60eb08 100644
--- a/repository/flickr/lang/en/repository_flickr.php
+++ b/repository/flickr/lang/en/repository_flickr.php
@@ -40,6 +40,6 @@ $string['notitle'] = 'notitle';
 $string['nullphotolist'] = 'There are no photos in this account';
 $string['remember'] = 'Remember me';
 $string['repositorydesc'] = 'Repository on flickr.com';
-$string['repositoryname'] = 'Flickr';
+$string['pluginname'] = 'Flickr';
 $string['secret'] = 'Secret';
 $string['username'] = 'Flickr account email';
diff --git a/repository/flickr_public/lang/en/repository_flickr_public.php b/repository/flickr_public/lang/en/repository_flickr_public.php
index 89689d761e5..3072013c1b7 100644
--- a/repository/flickr_public/lang/en/repository_flickr_public.php
+++ b/repository/flickr_public/lang/en/repository_flickr_public.php
@@ -46,7 +46,7 @@ $string['notitle'] = 'notitle';
 $string['nullphotolist'] = 'There are no photos in this account';
 $string['remember'] = 'Remember me';
 $string['repositorydesc'] = 'Repository on flickr.com';
-$string['repositoryname'] = 'Flickr public';
+$string['pluginname'] = 'Flickr public';
 $string['secret'] = 'Secret';
 $string['sharealike'] = 'Yes, as long as others share alike';
 $string['tag'] = 'Tag';
diff --git a/repository/flickr_public/repository.class.php b/repository/flickr_public/repository.class.php
index a6b0db04b45..bbc0e4c6f38 100644
--- a/repository/flickr_public/repository.class.php
+++ b/repository/flickr_public/repository.class.php
@@ -481,7 +481,7 @@ class repository_flickr_public extends repository {
     public static function plugin_init() {
         //here we create a default instance for this type
 
-        $id = repository::static_function('flickr_public','create', 'flickr_public', 0, get_system_context(), array('name' => get_string('repositoryname', 'repository_flickr_public'),'email_address' => null), 1);
+        $id = repository::static_function('flickr_public','create', 'flickr_public', 0, get_system_context(), array('name' => get_string('pluginname', 'repository_flickr_public'),'email_address' => null), 1);
         if (empty($id)) {
             return false;
         } else {
diff --git a/repository/googledocs/lang/en/repository_googledocs.php b/repository/googledocs/lang/en/repository_googledocs.php
index 64391a708b6..c24e4c0ae40 100644
--- a/repository/googledocs/lang/en/repository_googledocs.php
+++ b/repository/googledocs/lang/en/repository_googledocs.php
@@ -24,4 +24,4 @@
  */
 
 $string['googledocs:view'] = 'View google docs repository';
-$string['repositoryname'] = 'Google Docs';
+$string['pluginname'] = 'Google Docs';
diff --git a/repository/googledocs/repository.class.php b/repository/googledocs/repository.class.php
index f21b572cd53..9c8a02022f8 100644
--- a/repository/googledocs/repository.class.php
+++ b/repository/googledocs/repository.class.php
@@ -109,7 +109,7 @@ class repository_googledocs extends repository {
     }
 
     public function get_name(){
-        return get_string('repositoryname', 'repository_googledocs');
+        return get_string('pluginname', 'repository_googledocs');
     }
 
     public function get_file($url, $file) {
diff --git a/repository/lib.php b/repository/lib.php
index 5b80eef1515..4ac21bf46bc 100644
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -173,7 +173,7 @@ class repository_type {
      * @return string user-friendly type name
      */
     public function get_readablename() {
-        return get_string('repositoryname','repository_'.$this->_typename);
+        return get_string('pluginname','repository_'.$this->_typename);
     }
 
     /**
@@ -1044,7 +1044,7 @@ abstract class repository {
                 if (!empty($type) && $type->get_visible()) {
                     $instanceoptionnames = repository::static_function($type->get_typename(), 'get_instance_option_names');
                     if (!empty($instanceoptionnames)) {
-                        $instancehtml .= '<li><a href="'.$baseurl.'&amp;new='.$type->get_typename().'">'.get_string('createxxinstance', 'repository', get_string('repositoryname', 'repository_'.$type->get_typename()))
+                        $instancehtml .= '<li><a href="'.$baseurl.'&amp;new='.$type->get_typename().'">'.get_string('createxxinstance', 'repository', get_string('pluginname', 'repository_'.$type->get_typename()))
                             .'</a></li>';
                         $addable++;
                     }
diff --git a/repository/local/lang/en/repository_local.php b/repository/local/lang/en/repository_local.php
index 7ddc733e9ac..5be25577e0d 100644
--- a/repository/local/lang/en/repository_local.php
+++ b/repository/local/lang/en/repository_local.php
@@ -30,4 +30,4 @@ $string['local:view'] = 'View server repository';
 $string['notitle'] = 'notitle';
 $string['remember'] = 'Remember me';
 $string['repositorydesc'] = 'Files previously uploaded to the Moodle server';
-$string['repositoryname'] = 'Server files';
+$string['pluginname'] = 'Server files';
diff --git a/repository/local/repository.class.php b/repository/local/repository.class.php
index 68a31490721..f5df31348c8 100755
--- a/repository/local/repository.class.php
+++ b/repository/local/repository.class.php
@@ -161,7 +161,7 @@ class repository_local extends repository {
      * @return string repository name
      */
     public function get_name(){
-        return get_string('repositoryname', 'repository_local');;
+        return get_string('pluginname', 'repository_local');;
     }
 
     /**
diff --git a/repository/merlot/lang/en/repository_merlot.php b/repository/merlot/lang/en/repository_merlot.php
index 63c3c4e2501..8103e7fcf95 100644
--- a/repository/merlot/lang/en/repository_merlot.php
+++ b/repository/merlot/lang/en/repository_merlot.php
@@ -26,5 +26,5 @@
 $string['configplugin'] = 'Merlot.org configuration';
 $string['licensekey'] = 'License Key';
 $string['repositorydesc'] = 'Merlot.org';
-$string['repositoryname'] = 'Merlot.org';
+$string['pluginname'] = 'Merlot.org';
 $string['merlot:view'] = 'View the Merlot repository';
diff --git a/repository/picasa/lang/en/repository_picasa.php b/repository/picasa/lang/en/repository_picasa.php
index 06a5d4f107d..d20823e1817 100644
--- a/repository/picasa/lang/en/repository_picasa.php
+++ b/repository/picasa/lang/en/repository_picasa.php
@@ -24,4 +24,4 @@
  */
 
 $string['picasa:view'] = 'View picasa repository';
-$string['repositoryname'] = 'Picasa web album';
+$string['pluginname'] = 'Picasa web album';
diff --git a/repository/picasa/repository.class.php b/repository/picasa/repository.class.php
index 3b37d586727..7de106d345d 100644
--- a/repository/picasa/repository.class.php
+++ b/repository/picasa/repository.class.php
@@ -112,7 +112,7 @@ class repository_picasa extends repository {
     }
 
     public function get_name(){
-        return get_string('repositoryname', 'repository_picasa');
+        return get_string('pluginname', 'repository_picasa');
     }
     public function supported_filetypes() {
         return array('web_image');
diff --git a/repository/recent/lang/en/repository_recent.php b/repository/recent/lang/en/repository_recent.php
index 63c5039bf09..52c419db4ac 100644
--- a/repository/recent/lang/en/repository_recent.php
+++ b/repository/recent/lang/en/repository_recent.php
@@ -29,4 +29,4 @@ $string['emptyfilelist'] = 'There are no files to show';
 $string['notitle'] = 'notitle';
 $string['recent:view'] = 'View recent files repsitory plugin';
 $string['repositorydesc'] = 'Files recently used by current user';
-$string['repositoryname'] = 'Recent files';
+$string['pluginname'] = 'Recent files';
diff --git a/repository/recent/repository.class.php b/repository/recent/repository.class.php
index 4099c9f728a..78d74311f41 100755
--- a/repository/recent/repository.class.php
+++ b/repository/recent/repository.class.php
@@ -136,7 +136,7 @@ class repository_recent extends repository {
      * @return string repository name
      */
     public function get_name(){
-        return get_string('repositoryname', 'repository_recent');;
+        return get_string('pluginname', 'repository_recent');;
     }
 
     public static function get_type_option_names() {
diff --git a/repository/s3/lang/en/repository_s3.php b/repository/s3/lang/en/repository_s3.php
index 5f9c7eeee0f..121da86f1b4 100644
--- a/repository/s3/lang/en/repository_s3.php
+++ b/repository/s3/lang/en/repository_s3.php
@@ -26,6 +26,6 @@
 $string['access_key'] = 'Access key';
 $string['configplugin'] = 'Amazon S3 settings';
 $string['needaccesskey'] = 'Access key must be provided';
-$string['repositoryname'] = 'Amazon S3';
+$string['pluginname'] = 'Amazon S3';
 $string['secret_key'] = 'Secret key';
 $string['s3:view'] = 'View amazon s3 repository';
diff --git a/repository/upload/lang/en/repository_upload.php b/repository/upload/lang/en/repository_upload.php
index bbe378d3b8a..8a8c9d62b1c 100644
--- a/repository/upload/lang/en/repository_upload.php
+++ b/repository/upload/lang/en/repository_upload.php
@@ -25,5 +25,5 @@
 
 $string['configplugin'] = 'Configuration for upload plugin';
 $string['repositorydesc'] = 'Upload a file to Moodle';
-$string['repositoryname'] = 'Upload a file';
+$string['pluginname'] = 'Upload a file';
 $string['upload:view'] = 'Use uploading in file picker';
diff --git a/repository/upload/repository.class.php b/repository/upload/repository.class.php
index a3ddfda40cc..3e3ce486bb5 100755
--- a/repository/upload/repository.class.php
+++ b/repository/upload/repository.class.php
@@ -96,7 +96,7 @@ class repository_upload extends repository {
      * @return string
      */
     public function get_name(){
-        return get_string('repositoryname', 'repository_upload');
+        return get_string('pluginname', 'repository_upload');
     }
 
     /**
diff --git a/repository/url/lang/en/repository_url.php b/repository/url/lang/en/repository_url.php
index a9ae94c8963..79f69b81ad6 100644
--- a/repository/url/lang/en/repository_url.php
+++ b/repository/url/lang/en/repository_url.php
@@ -25,7 +25,7 @@
 
 $string['download'] = 'Download';
 $string['rename'] = 'Name';
-$string['repositoryname'] = 'URL Downloader';
+$string['pluginname'] = 'URL Downloader';
 $string['url'] = 'URL';
 $string['url:view'] = 'Use url downloader in file picker';
 $string['validname'] = 'You must provide a valid file name';
diff --git a/repository/url/repository.class.php b/repository/url/repository.class.php
index 2feaa977ba4..91ed08e05fe 100755
--- a/repository/url/repository.class.php
+++ b/repository/url/repository.class.php
@@ -156,7 +156,7 @@ EOD;
     }
 
     public function get_name(){
-        return get_string('repositoryname', 'repository_url');;
+        return get_string('pluginname', 'repository_url');;
     }
     public function supported_returntypes() {
         return (FILE_INTERNAL | FILE_EXTERNAL);
diff --git a/repository/user/lang/en/repository_user.php b/repository/user/lang/en/repository_user.php
index 71471c20694..c300f759669 100755
--- a/repository/user/lang/en/repository_user.php
+++ b/repository/user/lang/en/repository_user.php
@@ -26,6 +26,6 @@
 
 $string['configplugin'] = 'Configuration for user private files repository';
 $string['repositorydesc'] = 'Files in user private area';
-$string['repositoryname'] = 'Private files';
+$string['pluginname'] = 'Private files';
 $string['emptyfilelist'] = 'There are no files to show';
 $string['user:view'] = 'View user private files';
diff --git a/repository/webdav/lang/en/repository_webdav.php b/repository/webdav/lang/en/repository_webdav.php
index 0b90b8df27d..65e3c7caf41 100644
--- a/repository/webdav/lang/en/repository_webdav.php
+++ b/repository/webdav/lang/en/repository_webdav.php
@@ -26,7 +26,7 @@
 $string['configplugin'] = 'WebDav configuration';
 $string['http'] = 'HTTP';
 $string['https'] = 'HTTPS';
-$string['repositoryname'] = 'WebDAV repository';
+$string['pluginname'] = 'WebDAV repository';
 $string['webdav_password'] = 'WebDAV server password';
 $string['webdav_port'] = 'WebDAV server port';
 $string['webdav_server'] = 'WebDAV server';
diff --git a/repository/wikimedia/lang/en/repository_wikimedia.php b/repository/wikimedia/lang/en/repository_wikimedia.php
index 9bb68095a9e..28b19b8710b 100644
--- a/repository/wikimedia/lang/en/repository_wikimedia.php
+++ b/repository/wikimedia/lang/en/repository_wikimedia.php
@@ -24,5 +24,5 @@
  */
 
 $string['keyword'] = 'Full text';
-$string['repositoryname'] = 'Wikimedia';
+$string['pluginname'] = 'Wikimedia';
 $string['wikimedia:view'] = 'View wikimedia repository';
diff --git a/repository/youtube/lang/en/repository_youtube.php b/repository/youtube/lang/en/repository_youtube.php
index 8d674003652..70dfaa27f57 100644
--- a/repository/youtube/lang/en/repository_youtube.php
+++ b/repository/youtube/lang/en/repository_youtube.php
@@ -23,6 +23,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['repositoryname'] = 'Youtube videos';
+$string['pluginname'] = 'Youtube videos';
 $string['search'] = 'Search videos';
 $string['youtube:view'] = 'Use youtube in file picker';