diff options
29 files changed, 68 insertions, 52 deletions
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index 9e4012c35e3..75fd694e75d 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -1,5 +1,7 @@ <?php $TRANSLATIONS = array( +"Storage not available" => "Almacenamento non dispoñíbel", +"Storage invalid" => "Almacenamento incorrecto", "Unknown error" => "Produciuse un erro descoñecido", "Could not move %s - File with this name already exists" => "Non foi posíbel mover %s; Xa existe un ficheiro con ese nome.", "Could not move %s" => "Non foi posíbel mover %s", diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index b1af4676852..852b9111c12 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -157,8 +157,8 @@ class Proxy extends \OC_FileProxy { // store new unenecrypted size so that it can be updated // in the post proxy $tmpFileInfo = $view->getFileInfo($tmpPath); - if ( isset($tmpFileInfo['size']) ) { - self::$unencryptedSizes[\OC\Files\Filesystem::normalizePath($path)] = $tmpFileInfo['size']; + if ( isset($tmpFileInfo['unencrypted_size']) ) { + self::$unencryptedSizes[\OC\Files\Filesystem::normalizePath($path)] = $tmpFileInfo['unencrypted_size']; } // remove our temp file diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php index 8d6bc81b08d..9ec1f940edd 100644 --- a/apps/files_encryption/tests/proxy.php +++ b/apps/files_encryption/tests/proxy.php @@ -47,6 +47,7 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase { public $view; // view in /data/user/files public $rootView; // view on /data/user public $data; + public $dataLong; public $filename; public static function setUpBeforeClass() { @@ -80,6 +81,7 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase { // init short data $this->data = 'hats'; + $this->dataLong = file_get_contents(__DIR__ . '/../lib/crypt.php'); $this->filename = 'enc_proxy_tests-' . uniqid() . '.txt'; } @@ -95,17 +97,19 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase { */ function testPostFileSize() { - $this->view->file_put_contents($this->filename, $this->data); + $this->view->file_put_contents($this->filename, $this->dataLong); + $size = strlen($this->dataLong); \OC_FileProxy::$enabled = false; - $unencryptedSize = $this->view->filesize($this->filename); + $encryptedSize = $this->view->filesize($this->filename); \OC_FileProxy::$enabled = true; - $encryptedSize = $this->view->filesize($this->filename); + $unencryptedSize = $this->view->filesize($this->filename); - $this->assertTrue($encryptedSize !== $unencryptedSize); + $this->assertTrue($encryptedSize > $unencryptedSize); + $this->assertSame($size, $unencryptedSize); // cleanup $this->view->unlink($this->filename); diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php index cddf489cf02..4c5158e5e47 100644 --- a/apps/files_sharing/l10n/gl.php +++ b/apps/files_sharing/l10n/gl.php @@ -25,6 +25,7 @@ $TRANSLATIONS = array( "the link expired" => "a ligazón caducou", "sharing is disabled" => "foi desactivada a compartición", "For more info, please ask the person who sent this link." => "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón.", +"Add to your ownCloud" => "Engadir ao seu ownCloud", "Download" => "Descargar", "Download %s" => "Descargar %s", "Direct link" => "Ligazón directa", diff --git a/l10n/ast/lib.po b/l10n/ast/lib.po index a035585da5f..1e8ddbef5dc 100644 --- a/l10n/ast/lib.po +++ b/l10n/ast/lib.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-02 01:54-0400\n" -"PO-Revision-Date: 2014-07-02 02:59+0000\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" +"PO-Revision-Date: 2014-07-07 01:50+0000\n" "Last-Translator: Ḷḷumex03 <l.lumex03.tornes@gmail.com>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -579,7 +579,7 @@ msgstr "" #: private/util.php:609 msgid "PostgreSQL >= 9 required" -msgstr "" +msgstr "PostgreSQL >= 9 requeríu" #: private/util.php:610 msgid "Please upgrade your database version" @@ -587,7 +587,7 @@ msgstr "Por favor, anova la versión de la to base de datos" #: private/util.php:617 msgid "Error occurred while checking PostgreSQL version" -msgstr "" +msgstr "Asocedió un fallu entrín se comprobaba la versión de PostgreSQL" #: private/util.php:618 msgid "" diff --git a/l10n/es/lib.po b/l10n/es/lib.po index 303cc43a4d9..47ef3906a5e 100644 --- a/l10n/es/lib.po +++ b/l10n/es/lib.po @@ -20,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-03 01:54-0400\n" -"PO-Revision-Date: 2014-07-03 02:20+0000\n" -"Last-Translator: macofe <macofe.languagetool@gmail.com>\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" +"PO-Revision-Date: 2014-07-06 16:31+0000\n" +"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -505,7 +505,7 @@ msgstr "No se puede escribir en el directorio de \"apps\"" msgid "" "This can usually be fixed by %sgiving the webserver write access to the apps" " directory%s or disabling the appstore in the config file." -msgstr "" +msgstr "Esto puede ser facilmente solucionado, %sdando permisos de escritura al servidor Web en el directorio%s de apps o deshabilitando la tienda de apps en el archivo de configuración." #: private/util.php:440 #, php-format @@ -522,13 +522,13 @@ msgstr "Esto puede ser solucionado <a href=\"%s\" target=\"_blank\">dando al ser #: private/util.php:457 #, php-format msgid "Setting locale to %s failed" -msgstr "" +msgstr "Falló la activación del idioma %s " #: private/util.php:460 msgid "" "Please install one of theses locales on your system and restart your " "webserver." -msgstr "" +msgstr "Por favor instale uno de estos idiomas en su sitema y reinicie su servidor Web." #: private/util.php:464 msgid "Please ask your server administrator to install the module." diff --git a/l10n/gl/files.po b/l10n/gl/files.po index 05aef6c185b..73f16886a3f 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-05 01:54-0400\n" -"PO-Revision-Date: 2014-07-04 15:13+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" +"PO-Revision-Date: 2014-07-06 21:00+0000\n" +"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,11 +21,11 @@ msgstr "" #: ajax/list.php:38 msgid "Storage not available" -msgstr "" +msgstr "Almacenamento non dispoñíbel" #: ajax/list.php:45 msgid "Storage invalid" -msgstr "" +msgstr "Almacenamento incorrecto" #: ajax/list.php:52 msgid "Unknown error" diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po index b4896100ff8..3384e75c4e4 100644 --- a/l10n/gl/files_sharing.po +++ b/l10n/gl/files_sharing.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-05 01:54-0400\n" -"PO-Revision-Date: 2014-07-05 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" +"PO-Revision-Date: 2014-07-06 20:41+0000\n" +"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -122,7 +122,7 @@ msgstr "Para obter máis información, pregúntelle á persoa que lle enviou a l #: templates/public.php:22 msgid "Add to your ownCloud" -msgstr "" +msgstr "Engadir ao seu ownCloud" #: templates/public.php:30 msgid "Download" diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index 7705716264a..1a294ae1075 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-05 01:54-0400\n" -"PO-Revision-Date: 2014-07-04 15:13+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" +"PO-Revision-Date: 2014-07-06 20:51+0000\n" +"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -785,7 +785,7 @@ msgid "" "\t\tor\n" "\t\t<a href=\"https://owncloud.org/promote\"\n" "\t\t\ttarget=\"_blank\">spread the word</a>!" -msgstr "" +msgstr "Se quere colaborar co proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">participar no desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">axudar a difundilo</a>!" #: templates/personal.php:31 msgid "Show First Run Wizard again" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index e094d6af9a6..acd9ba2818d 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -29,8 +29,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-05 01:54-0400\n" -"PO-Revision-Date: 2014-07-04 15:13+0000\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" +"PO-Revision-Date: 2014-07-06 14:31+0000\n" "Last-Translator: I Robot\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index aa1abd55dba..5bf92e85668 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-06 01:54-0400\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 75e6c6eb25a..59e72232d1c 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-06 01:54-0400\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index f7cb591e471..c86e85353c2 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-06 01:54-0400\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 9fe7cbe7a80..d21c157c972 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-06 01:54-0400\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index b1198b3f839..b0ab33adf6b 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-06 01:54-0400\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 0154cab1d16..538dc72584b 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-06 01:54-0400\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index e4e03747dd6..2fb71ca30e9 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-06 01:54-0400\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 8a142aeeb68..3db354c5764 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-06 01:54-0400\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot index d06d5ae5485..449e88b4f2c 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-06 01:54-0400\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 5b9e631e5e9..dd891b84cac 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-06 01:54-0400\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 9c52c82f582..23ece5367e1 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-06 01:54-0400\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index a464f1ffdaf..04d62439016 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-06 01:54-0400\n" +"POT-Creation-Date: 2014-07-07 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/lib/l10n/ast.php b/lib/l10n/ast.php index 3e9646f59cb..9a9c7b2c546 100644 --- a/lib/l10n/ast.php +++ b/lib/l10n/ast.php @@ -92,7 +92,9 @@ $TRANSLATIONS = array( "Cannot write into \"apps\" directory" => "Nun pue escribise nel direutoriu \"apps\"", "Cannot create \"data\" directory (%s)" => "Nun pue crease'l direutoriu \"data\" (%s)", "Please ask your server administrator to install the module." => "Por favor, entrúga-y al to alministrador del sirvidor pa instalar el módulu.", +"PostgreSQL >= 9 required" => "PostgreSQL >= 9 requeríu", "Please upgrade your database version" => "Por favor, anova la versión de la to base de datos", +"Error occurred while checking PostgreSQL version" => "Asocedió un fallu entrín se comprobaba la versión de PostgreSQL", "Could not obtain lock type %d on \"%s\"." => "Nun pudo facese'l bloquéu %d en \"%s\"." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/es.php b/lib/l10n/es.php index 06faa7ebc0c..fb059bf8b7a 100644 --- a/lib/l10n/es.php +++ b/lib/l10n/es.php @@ -94,8 +94,11 @@ $TRANSLATIONS = array( "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Los permisos usualmente pueden ser solucionados, %sdando permisos de escritura al directorio de configuración en el servidor Web%s.", "Cannot write into \"config\" directory" => "No se puede escribir el el directorio de configuración", "Cannot write into \"apps\" directory" => "No se puede escribir en el directorio de \"apps\"", +"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Esto puede ser facilmente solucionado, %sdando permisos de escritura al servidor Web en el directorio%s de apps o deshabilitando la tienda de apps en el archivo de configuración.", "Cannot create \"data\" directory (%s)" => "No puedo crear del directorio \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Esto puede ser solucionado <a href=\"%s\" target=\"_blank\">dando al servidor web permisos de escritura en el directorio raíz</a>.", +"Setting locale to %s failed" => "Falló la activación del idioma %s ", +"Please install one of theses locales on your system and restart your webserver." => "Por favor instale uno de estos idiomas en su sitema y reinicie su servidor Web.", "Please ask your server administrator to install the module." => "Consulte al administrador de su servidor para instalar el módulo.", "PHP module %s not installed." => "El ódulo PHP %s no está instalado.", "PHP %s or higher is required." => "Se requiere PHP %s o superior.", diff --git a/lib/private/app.php b/lib/private/app.php index 0ca2ca36bd2..b7d58c72340 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -574,7 +574,7 @@ class OC_App { * Read all app metadata from the info.xml file * @param string $appid id of the app or the path of the info.xml file * @param boolean $path (optional) - * @return array + * @return array|null * @note all data is read from info.xml, not just pre-defined fields */ public static function getAppInfo($appid, $path = false) { @@ -587,6 +587,9 @@ class OC_App { $file = self::getAppPath($appid) . '/appinfo/info.xml'; } $data = array(); + if (!file_exists($file)) { + return null; + } $content = @file_get_contents($file); if (!$content) { return null; diff --git a/settings/js/apps.js b/settings/js/apps.js index 4cd7520caa7..3f9a9eab17a 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -84,12 +84,12 @@ OC.Settings.Apps = OC.Settings.Apps || { page.find('input.update').hide(); } - if (app.removable !== false) { - page.find('input.uninstall').show(); - page.find('input.uninstall').data('appid', app.id); - page.find('input.uninstall').attr('value', t('settings', 'Uninstall App')); + if (app.removable !== false && app.active === false) { + page.find('a.uninstall').show(); + page.find('a.uninstall').data('appid', app.id); + page.find('a.uninstall').attr('value', t('settings', 'Uninstall App')); } else { - page.find('input.uninstall').hide(); + page.find('a.uninstall').hide(); } page.find('input.enable').show(); @@ -371,7 +371,7 @@ $(document).ready(function(){ OC.Settings.Apps.updateApp(appid, element); } }); - $('#app-content input.uninstall').click(function(){ + $('#app-content a.uninstall').click(function(){ var element = $(this); var appid=$(this).data('appid'); if(appid) { diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php index 6098cc65056..051bffb312d 100644 --- a/settings/l10n/gl.php +++ b/settings/l10n/gl.php @@ -172,6 +172,7 @@ $TRANSLATIONS = array( "Bugtracker" => "Seguemento de fallos", "Commercial Support" => "Asistencia comercial", "Get the apps to sync your files" => "Obteña os aplicativos para sincronizar os seus ficheiros", +"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Se quere colaborar co proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">participar no desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">axudar a difundilo</a>!", "Show First Run Wizard again" => "Amosar o axudante da primeira execución outra vez", "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>", "Password" => "Contrasinal", diff --git a/settings/templates/apps.php b/settings/templates/apps.php index b35eda4350c..29fda0ed243 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -53,7 +53,7 @@ print_unescaped($l->t('<span class="licence"></span>-licensed by <span class="author"></span>'));?></p> <input class="enable hidden" type="submit" /> <input class="update hidden" type="submit" value="<?php p($l->t('Update')); ?>" /> - <input class="uninstall hidden" type="submit" value="<?php p($l->t('Uninstall')); ?>"/> + <a class="uninstall hidden" href="#"><?php p($l->t('Uninstall')); ?></a> <br /> <input class="hidden" type="checkbox" id="groups_enable"/> <label class="hidden" for="groups_enable"><?php p($l->t('Enable only for specific groups')); ?></label> diff --git a/version.php b/version.php index d1da87a667b..24429434116 100644 --- a/version.php +++ b/version.php @@ -3,7 +3,7 @@ // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version=array(8, 0, 0, 0); +$OC_Version=array(7, 8, 0, 0); // The human readable string $OC_VersionString='8.0 pre alpha'; |