diff --git a/classes/MarketPlugin.class.php b/classes/MarketPlugin.class.php index 8aebeb2a902f559e705602dced9fd509cd851530..6abacd9d4a2e478e56438ed9fa0bda01824f4ca3 100755 --- a/classes/MarketPlugin.class.php +++ b/classes/MarketPlugin.class.php @@ -58,7 +58,7 @@ class MarketPlugin extends SimpleORMap { $messaging->sendSystemMessage( $beauftragter, sprintf(_("Plugin %s braucht ein Review"), $this['name']), - _("Auf dem Marktplatz wurde ein neues Plugin �ffentlich geschaltet. Es kann allerdings erst �ffentlich auf dem Marktplatz erscheinen, wenn Sie das Plugin einmal reviewt haben und freischalten. Gehen Sie auf den Pluginmarktplatz und den Reiter 'Qualit�tssicherung'.") + _("Auf dem Marktplatz wurde ein neues Plugin öffentlich geschaltet. Es kann allerdings erst öffentlich auf dem Marktplatz erscheinen, wenn Sie das Plugin einmal reviewt haben und freischalten. Gehen Sie auf den Pluginmarktplatz und den Reiter 'Qualitätssicherung'.") ); } } @@ -168,4 +168,4 @@ class MarketPlugin extends SimpleORMap { return $rating; } -} \ No newline at end of file +} diff --git a/migrations/02_import_old_data.php b/migrations/02_import_old_data.php index b5a338f2a0495b93e37f9fe69dcfc2a7e619d880..1581e73ebb517cb6eaa49149dbc040a7357baf47 100755 --- a/migrations/02_import_old_data.php +++ b/migrations/02_import_old_data.php @@ -1,7 +1,7 @@ <?php class ImportOldData extends Migration { - + function description() { return 'imports all the old data'; } @@ -15,10 +15,10 @@ class ImportOldData extends Migration { $releasefolder = $GLOBALS['STUDIP_BASE_PATH'] . "/data/pluginmarket_releases"; $imagefolder = $GLOBALS['STUDIP_BASE_PATH'] . "/data/pluginmarket_images"; */ - + // Check if migration is possible $oldTablesExisting = $db->query('SHOW TABLES LIKE "mp_plugins"')->rowCount(); - + if ($oldTablesExisting) { //import plugins $db->exec(" @@ -60,7 +60,7 @@ class ImportOldData extends Migration { $name = "elearning"; } if ($category_id === "ef0508ebf53d95c1e9f0afcbb75de3cf") { - $name = "spa�"; + $name = "spaß"; } $name = strtolower($name); $plugin_ids = $db->query(" @@ -80,24 +80,24 @@ class ImportOldData extends Migration { //move user_ids for the powerusers $user_mappings = array( '9790cb9e745cb7d85d3bc5a00141c851' => "2be5757744a32e6fe9a591f628f85ae8", //Jan Kulmann - '8fcc07aaadbc82bb8e72a4faa1ae42d0' => "f28e9576efd238287b8db87ac1119087", //Andr� Noack + '8fcc07aaadbc82bb8e72a4faa1ae42d0' => "f28e9576efd238287b8db87ac1119087", //André Noack '2ee0aa5f6dcd48b945a1c786f488c148' => "f953070076eadbfd898e9552a35f5d95", //Jan-Hendrik Wilms '17bf68a718c9ebc0010b96fb5fb99bc6' => "a704f6b9e0881ea966ae70a45483fe91", //Florian Bieringer - '930f2b06cf0b2e088c295a2c7775d3ea' => "1616d8e6e7f1021da600ce016674e3c5", //Till Gl�ggler + '930f2b06cf0b2e088c295a2c7775d3ea' => "1616d8e6e7f1021da600ce016674e3c5", //Till Glöggler 'e7d1aa70c09882f57906e598319afcd8' => "a32ec5d4b3da276e71653a7d66511dc7", //Elmar Ludwig '98a5b6860577340912c0522c4717cf25' => "74b76020d6572a22aa66c3644af74619", //Oliver Oster '1f27f5c4d0be374f74bac398b9a025e0' => "0e373b8b062fb2cd17502181a47a64d6", //Bernhard Strehl '36e8c9f4b4c8a07393d3687a7dcb7610' => "fdc5720c87e94d6d4594f2daa6bfd384", //Tobias Thelen '75c643d817cfef8741ba26259315db77' => "58abc52d98e2fb51f4409481cdab39f3", //Rasmus Fuhse 'f41cb64714f820d10d094958ed9d6d9d' => "d3bb8252247c6decf759170b7a0cbb49", //Johannes Stichler - '53d48eed2e6f1390b6e97f38f70d424a' => "23fbf006cb81fa8db4d2404a59758c6c", //Nico M�ller + '53d48eed2e6f1390b6e97f38f70d424a' => "23fbf006cb81fa8db4d2404a59758c6c", //Nico Müller '9afe50de3e49fceef0fee915f077f958' => "4e6e5879260347913ee16e6e7d39de4e", //Thomas Hackl 'e52aeb847121e1878af017a933480960' => "38e5d370b109239c6e25137c19232e1d", //Eric Laubmeyer '384bd46f74a845fe5e70f23e909d0b8e' => "ca5b8e769f71a7b66f030cbcf346ea62", //Robert Costa '17ab55f49e50497992ae44cb306231e0' => "20fabec10a53dfab3615bf5ee491dd5a", //Marcus Lunzenauer '37f6c72b598d64bf082a7fc0c8fa6811' => "0e5487512b84adfe83fc3fef055658f0", //Stefan Suchi - 'b64fc94a38ead9119c936a8056c9cceb' => "790a3ccb7bcebd5fa9dcbbdbd74429b2", //J�rg R�pke - '8f803630b5fa7756d1b2431436c4baff' => "3f1503ee51b2a326fec61efa35839fc2", //Arne Schr�der + 'b64fc94a38ead9119c936a8056c9cceb' => "790a3ccb7bcebd5fa9dcbbdbd74429b2", //Jörg Röpke + '8f803630b5fa7756d1b2431436c4baff' => "3f1503ee51b2a326fec61efa35839fc2", //Arne Schröder '49d15355f3fbe8b15c59f949d362747d' => "4abd1b0ca7fd763016316bec212e3866", //Stefan Osterloh 'c28b58bbe8e0755b5b6e2784160aa35b' => "84476bf266debf59c34f76ac82f59a03", //Lennart G '64cba677908f2a058d20c67a5ada7663' => "ba850607ce72dd2d2cbe46361c91ecab", //Olga Mertsalova (?) @@ -134,8 +134,8 @@ class ImportOldData extends Migration { } } } - + public function down() { } -} \ No newline at end of file +} diff --git a/views/presenting/propose_usage.php b/views/presenting/propose_usage.php index 0ec7130d82c8c270bb18c8b0dfb982238e76ec49..a6707de7210be5ce545847da7af2856f8cdbf065 100755 --- a/views/presenting/propose_usage.php +++ b/views/presenting/propose_usage.php @@ -21,4 +21,4 @@ </p> <? endif; ?> </fieldset> -</form> \ No newline at end of file +</form>