diff options
39 files changed, 143 insertions, 114 deletions
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index c327d2b9f94..ec5b716fb2a 100644 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -53,13 +53,13 @@ $result = array( ); if(trim($filename) === '') { - $result['data'] = array('message' => $l10n->t('File name cannot be empty.')); + $result['data'] = array('message' => (string)$l10n->t('File name cannot be empty.')); OCP\JSON::error($result); exit(); } if(strpos($filename, '/') !== false) { - $result['data'] = array('message' => $l10n->t('File name must not contain "/". Please choose a different name.')); + $result['data'] = array('message' => (string)$l10n->t('File name must not contain "/". Please choose a different name.')); OCP\JSON::error($result); exit(); } @@ -68,7 +68,7 @@ if(strpos($filename, '/') !== false) { $target = $dir.'/'.$filename; if (\OC\Files\Filesystem::file_exists($target)) { - $result['data'] = array('message' => $l10n->t( + $result['data'] = array('message' => (string)$l10n->t( 'The name %s is already used in the folder %s. Please choose a different name.', array($filename, $dir)) ); @@ -78,20 +78,32 @@ if (\OC\Files\Filesystem::file_exists($target)) { if($source) { if(substr($source, 0, 8)!='https://' and substr($source, 0, 7)!='http://') { - OCP\JSON::error(array('data' => array( 'message' => $l10n->t('Not a valid source') ))); + OCP\JSON::error(array('data' => array('message' => $l10n->t('Not a valid source')))); + exit(); + } + + if (!ini_get('allow_url_fopen')) { + $eventSource->send('error', array('message' => $l10n->t('Server is not allowed to open URLs, please check the server configuration'))); + $eventSource->close(); exit(); } $ctx = stream_context_create(null, array('notification' =>'progress')); - $sourceStream=fopen($source, 'rb', false, $ctx); - $result=\OC\Files\Filesystem::file_put_contents($target, $sourceStream); + $sourceStream=@fopen($source, 'rb', false, $ctx); + $result = 0; + if (is_resource($sourceStream)) { + $result=\OC\Files\Filesystem::file_put_contents($target, $sourceStream); + } if($result) { $meta = \OC\Files\Filesystem::getFileInfo($target); $mime=$meta['mimetype']; $id = $meta['fileid']; - $eventSource->send('success', array('mime'=>$mime, 'size'=>\OC\Files\Filesystem::filesize($target), 'id' => $id, 'etag' => $meta['etag'])); + $eventSource->send('success', array('mime' => $mime, 'size' => \OC\Files\Filesystem::filesize($target), 'id' => $id, 'etag' => $meta['etag'])); } else { - $eventSource->send('error', $l10n->t('Error while downloading %s to %s', array($source, $target))); + $eventSource->send('error', array('message' => $l10n->t('Error while downloading %s to %s', array($source, $target)))); + } + if (is_resource($sourceStream)) { + fclose($sourceStream); } $eventSource->close(); exit(); diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index e9663353f74..196817432d5 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -658,7 +658,12 @@ $(document).ready(function() { }); eventSource.listen('error',function(error) { $('#uploadprogressbar').fadeOut(); - alert(error); + var message = (error && error.message) || t('core', 'Error fetching URL'); + OC.Notification.show(message); + //hide notification after 10 sec + setTimeout(function() { + OC.Notification.hide(); + }, 10000); }); break; } diff --git a/apps/files/l10n/es_CL.php b/apps/files/l10n/es_CL.php index 0157af093e9..6f97758878f 100644 --- a/apps/files/l10n/es_CL.php +++ b/apps/files/l10n/es_CL.php @@ -1,7 +1,9 @@ <?php $TRANSLATIONS = array( +"Files" => "Archivos", "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), -"_Uploading %n file_::_Uploading %n files_" => array("","") +"_Uploading %n file_::_Uploading %n files_" => array("",""), +"Upload" => "Subir" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index 96667493a51..41f352d853a 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -209,10 +209,7 @@ class Proxy extends \OC_FileProxy { $util = new Util($view, $userId); - // get relative path - $relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path); - - list($owner, $ownerPath) = $util->getUidAndFilename($relativePath); + list($owner, $ownerPath) = $util->getUidAndFilename($relPath); // Delete keyfile & shareKey so it isn't orphaned if (!Keymanager::deleteFileKey($view, $ownerPath)) { diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index d4aa4d31649..a3852312200 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -415,49 +415,6 @@ class Util { } /** - * @brief Fetch the last lines of a file efficiently - * @note Safe to use on large files; does not read entire file to memory - * @note Derivative of http://tekkie.flashbit.net/php/tail-functionality-in-php - */ - public function tail($filename, $numLines) { - - \OC_FileProxy::$enabled = false; - - $text = ''; - $pos = -1; - $handle = $this->view->fopen($filename, 'r'); - - while ($numLines > 0) { - - --$pos; - - if (fseek($handle, $pos, SEEK_END) !== 0) { - - rewind($handle); - $numLines = 0; - - } elseif (fgetc($handle) === "\n") { - - --$numLines; - - } - - $block_size = (-$pos) % 8192; - if ($block_size === 0 || $numLines === 0) { - - $text = fread($handle, ($block_size === 0 ? 8192 : $block_size)) . $text; - - } - } - - fclose($handle); - - \OC_FileProxy::$enabled = true; - - return $text; - } - - /** * @brief Check if a given path identifies an encrypted file * @param string $path * @return boolean diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 3ccb35e327a..060d4dfedc7 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -65,7 +65,7 @@ body { } footer { - margin-top: 45px; + margin-top: 65px; } p.info { diff --git a/apps/files_sharing/l10n/es_CL.php b/apps/files_sharing/l10n/es_CL.php new file mode 100644 index 00000000000..31dc045870c --- /dev/null +++ b/apps/files_sharing/l10n/es_CL.php @@ -0,0 +1,6 @@ +<?php +$TRANSLATIONS = array( +"Password" => "Clave", +"Upload" => "Subir" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_ldap/l10n/es_CL.php b/apps/user_ldap/l10n/es_CL.php index 3a1e002311c..b3522617b42 100644 --- a/apps/user_ldap/l10n/es_CL.php +++ b/apps/user_ldap/l10n/es_CL.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "_%s group found_::_%s groups found_" => array("",""), -"_%s user found_::_%s users found_" => array("","") +"_%s user found_::_%s users found_" => array("",""), +"Password" => "Clave" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/js/js.js b/core/js/js.js index 54b4d51a707..3650d0520a7 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -48,8 +48,8 @@ function initL10N(app) { t.cache[app] = []; } } - if (typeof t.plural_function == 'undefined') { - t.plural_function = function (n) { + if (typeof t.plural_function[app] == 'undefined') { + t.plural_function[app] = function (n) { var p = (n != 1) ? 1 : 0; return { 'nplural' : 2, 'plural' : p }; }; @@ -74,7 +74,7 @@ function initL10N(app) { Gettext._locale_data[domain].head.plural_func = eval("("+code+")"); */ var code = 'var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) };'; - t.plural_function = new Function("n", code); + t.plural_function[app] = new Function("n", code); } else { console.log("Syntax error in language file. Plural-Forms header is invalid ["+t.plural_forms+"]"); } @@ -110,6 +110,10 @@ function t(app, text, vars, count){ } } t.cache = {}; +// different apps might or might not redefine the nplurals function correctly +// this is to make sure that a "broken" app doesn't mess up with the +// other app's plural function +t.plural_function = {}; /** * translate a string @@ -126,7 +130,7 @@ function n(app, text_singular, text_plural, count, vars) { if( typeof( t.cache[app][identifier] ) !== 'undefined' ){ var translation = t.cache[app][identifier]; if ($.isArray(translation)) { - var plural = t.plural_function(count); + var plural = t.plural_function[app](count); return t(app, translation[plural.plural], vars, count); } } diff --git a/core/l10n/es_CL.php b/core/l10n/es_CL.php index ffcdde48d47..819cc68a1c9 100644 --- a/core/l10n/es_CL.php +++ b/core/l10n/es_CL.php @@ -1,9 +1,12 @@ <?php $TRANSLATIONS = array( +"Settings" => "Configuración", "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), -"_{count} file conflict_::_{count} file conflicts_" => array("","") +"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Password" => "Clave", +"Username" => "Usuario" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/issue_template.md b/issue_template.md index a9ff75a3b86..0ddc7667bf3 100644 --- a/issue_template.md +++ b/issue_template.md @@ -26,6 +26,8 @@ List of activated app: The content of config/config.php: (Without the database password and passwordsalt) +Are you using external storage, if yes which one: + ### Client configuration Browser: diff --git a/l10n/es_CL/core.po b/l10n/es_CL/core.po index b8882ca78a1..38ae72f7142 100644 --- a/l10n/es_CL/core.po +++ b/l10n/es_CL/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-12-17 06:45-0500\n" -"PO-Revision-Date: 2013-12-16 14:34+0000\n" +"POT-Creation-Date: 2013-12-17 16:42-0500\n" +"PO-Revision-Date: 2013-12-17 15:30+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -150,7 +150,7 @@ msgstr "" #: js/js.js:394 msgid "Settings" -msgstr "" +msgstr "Configuración" #: js/js.js:865 msgid "seconds ago" @@ -315,7 +315,7 @@ msgstr "" #: js/share.js:224 templates/installation.php:58 templates/login.php:38 msgid "Password" -msgstr "" +msgstr "Clave" #: js/share.js:229 msgid "Allow Public Upload" @@ -483,7 +483,7 @@ msgstr "" #: lostpassword/templates/lostpassword.php:21 templates/installation.php:52 #: templates/login.php:31 msgid "Username" -msgstr "" +msgstr "Usuario" #: lostpassword/templates/lostpassword.php:25 msgid "" diff --git a/l10n/es_CL/files.po b/l10n/es_CL/files.po index 7080387a1fc..a1f4067622d 100644 --- a/l10n/es_CL/files.po +++ b/l10n/es_CL/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-12-17 06:45-0500\n" -"PO-Revision-Date: 2013-12-16 14:34+0000\n" +"POT-Creation-Date: 2013-12-17 16:42-0500\n" +"PO-Revision-Date: 2013-12-17 15:30+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -128,7 +128,7 @@ msgstr "" #: appinfo/app.php:11 msgid "Files" -msgstr "" +msgstr "Archivos" #: js/file-upload.js:228 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" @@ -299,7 +299,7 @@ msgstr "" #: lib/helper.php:11 templates/index.php:16 msgid "Upload" -msgstr "" +msgstr "Subir" #: templates/admin.php:5 msgid "File handling" diff --git a/l10n/es_CL/files_sharing.po b/l10n/es_CL/files_sharing.po index 3ae8e9fd37f..a4836e6eea7 100644 --- a/l10n/es_CL/files_sharing.po +++ b/l10n/es_CL/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-12-17 06:45-0500\n" -"PO-Revision-Date: 2013-12-16 14:34+0000\n" +"POT-Creation-Date: 2013-12-17 16:42-0500\n" +"PO-Revision-Date: 2013-12-17 15:30+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgstr "" #: templates/authenticate.php:10 msgid "Password" -msgstr "" +msgstr "Clave" #: templates/part.404.php:3 msgid "Sorry, this link doesn’t seem to work anymore." @@ -69,7 +69,7 @@ msgstr "" #: templates/public.php:46 templates/public.php:49 msgid "Upload" -msgstr "" +msgstr "Subir" #: templates/public.php:59 msgid "Cancel upload" diff --git a/l10n/es_CL/lib.po b/l10n/es_CL/lib.po index 5e853155fc1..6916a5d7935 100644 --- a/l10n/es_CL/lib.po +++ b/l10n/es_CL/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-12-17 06:45-0500\n" -"PO-Revision-Date: 2013-12-17 11:45+0000\n" +"POT-Creation-Date: 2013-12-17 16:42-0500\n" +"PO-Revision-Date: 2013-12-17 15:30+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "" #: private/app.php:384 msgid "Settings" -msgstr "" +msgstr "Configuración" #: private/app.php:396 msgid "Users" @@ -162,7 +162,7 @@ msgstr "" #: private/search/provider/file.php:18 private/search/provider/file.php:36 msgid "Files" -msgstr "" +msgstr "Archivos" #: private/search/provider/file.php:27 private/search/provider/file.php:34 msgid "Text" diff --git a/l10n/es_CL/settings.po b/l10n/es_CL/settings.po index e917cc27511..75d4de7ece4 100644 --- a/l10n/es_CL/settings.po +++ b/l10n/es_CL/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-12-17 06:45-0500\n" -"PO-Revision-Date: 2013-12-16 14:34+0000\n" +"POT-Creation-Date: 2013-12-17 16:42-0500\n" +"PO-Revision-Date: 2013-12-17 15:30+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -508,7 +508,7 @@ msgstr "" #: templates/personal.php:39 templates/users.php:23 templates/users.php:89 msgid "Password" -msgstr "" +msgstr "Clave" #: templates/personal.php:40 msgid "Your password was changed" @@ -649,7 +649,7 @@ msgstr "" #: templates/users.php:87 msgid "Username" -msgstr "" +msgstr "Usuario" #: templates/users.php:94 msgid "Storage" diff --git a/l10n/es_CL/user_ldap.po b/l10n/es_CL/user_ldap.po index c64198a289e..d7d15250941 100644 --- a/l10n/es_CL/user_ldap.po +++ b/l10n/es_CL/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-12-17 06:45-0500\n" -"PO-Revision-Date: 2013-12-16 14:34+0000\n" +"POT-Creation-Date: 2013-12-17 16:42-0500\n" +"PO-Revision-Date: 2013-12-17 15:30+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -250,7 +250,7 @@ msgstr "" #: templates/part.wizard-server.php:52 msgid "Password" -msgstr "" +msgstr "Clave" #: templates/part.wizard-server.php:53 msgid "For anonymous access, leave DN and Password empty." diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po index 027ee40f2ef..f13ef93c513 100644 --- a/l10n/fi_FI/lib.po +++ b/l10n/fi_FI/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-12-17 06:45-0500\n" -"PO-Revision-Date: 2013-12-17 11:45+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-12-17 16:42-0500\n" +"PO-Revision-Date: 2013-12-17 11:50+0000\n" +"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -99,7 +99,7 @@ msgstr "Lähdettä ei määritelty sovellusta asennettaessa" #: private/installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Href-määritettä ei asetettu asennettaessa sovellusta http:n yli" #: private/installer.php:75 msgid "No path specified when installing app from local file" @@ -112,7 +112,7 @@ msgstr "Tyypin %s arkistot eivät ole tuettuja" #: private/installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Pakettitiedoston avaaminen epäonnistui sovellusta asennettaessa" #: private/installer.php:125 msgid "App does not provide an info.xml file" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index eabe4b3de40..50ee36af6de 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: 2013-12-17 06:45-0500\n" +"POT-Creation-Date: 2013-12-18 01:55-0500\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 324395914db..f615b51ee27 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: 2013-12-17 06:45-0500\n" +"POT-Creation-Date: 2013-12-18 01:55-0500\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 6731b231738..2c0d23f1e36 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: 2013-12-17 06:45-0500\n" +"POT-Creation-Date: 2013-12-18 01:55-0500\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 879e2eb0ef5..fe6db3b7bff 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: 2013-12-17 06:45-0500\n" +"POT-Creation-Date: 2013-12-18 01:55-0500\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 a82f79a1aa5..7725bcd6f19 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: 2013-12-17 06:45-0500\n" +"POT-Creation-Date: 2013-12-18 01:55-0500\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 8614aeb37fa..5341ce8c9f5 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: 2013-12-17 06:45-0500\n" +"POT-Creation-Date: 2013-12-18 01:55-0500\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 932792cdba0..54d7ae5e04b 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: 2013-12-17 06:45-0500\n" +"POT-Creation-Date: 2013-12-18 01:55-0500\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 733bf92518e..5f114291d49 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: 2013-12-17 06:45-0500\n" +"POT-Creation-Date: 2013-12-18 01:55-0500\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 52099af8d57..f1b2bc44f86 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: 2013-12-17 06:45-0500\n" +"POT-Creation-Date: 2013-12-18 01:55-0500\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 71652d76dc0..496b6e61225 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: 2013-12-17 06:45-0500\n" +"POT-Creation-Date: 2013-12-18 01:55-0500\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 5390365a32c..8f8922d3f5a 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: 2013-12-17 06:45-0500\n" +"POT-Creation-Date: 2013-12-18 01:55-0500\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 25d60c745fc..d0582501b00 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: 2013-12-17 06:45-0500\n" +"POT-Creation-Date: 2013-12-18 01:55-0500\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/es_CL.php b/lib/l10n/es_CL.php index 15f78e0bce6..46158b0ccc7 100644 --- a/lib/l10n/es_CL.php +++ b/lib/l10n/es_CL.php @@ -1,5 +1,7 @@ <?php $TRANSLATIONS = array( +"Settings" => "Configuración", +"Files" => "Archivos", "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day go_::_%n days ago_" => array("",""), diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php index 17edda378c8..573704da44c 100644 --- a/lib/l10n/fi_FI.php +++ b/lib/l10n/fi_FI.php @@ -16,8 +16,10 @@ $TRANSLATIONS = array( "Back to Files" => "Takaisin tiedostoihin", "Selected files too large to generate zip file." => "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon.", "No source specified when installing app" => "Lähdettä ei määritelty sovellusta asennettaessa", +"No href specified when installing app from http" => "Href-määritettä ei asetettu asennettaessa sovellusta http:n yli", "No path specified when installing app from local file" => "Polkua ei määritelty sovellusta asennettaessa paikallisesta tiedostosta", "Archives of type %s are not supported" => "Tyypin %s arkistot eivät ole tuettuja", +"Failed to open archive when installing app" => "Pakettitiedoston avaaminen epäonnistui sovellusta asennettaessa", "App does not provide an info.xml file" => "Sovellus ei sisällä info.xml-tiedostoa", "App can't be installed because of not allowed code in the App" => "Sovellusta ei voi asentaa, koska sovellus sisältää kiellettyä koodia", "App can't be installed because it is not compatible with this version of ownCloud" => "Sovellusta ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa", diff --git a/lib/private/eventsource.php b/lib/private/eventsource.php index a83084d9251..4df0bc2e7cd 100644 --- a/lib/private/eventsource.php +++ b/lib/private/eventsource.php @@ -64,13 +64,13 @@ class OC_EventSource{ } if($this->fallback) { $response='<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack(' - .$this->fallBackId.',"'.$type.'",'.json_encode($data).')</script>'.PHP_EOL; + .$this->fallBackId.',"' . $type . '",' . OCP\JSON::encode($data) . ')</script>' . PHP_EOL; echo $response; }else{ if($type) { - echo 'event: '.$type.PHP_EOL; + echo 'event: ' . $type.PHP_EOL; } - echo 'data: '.json_encode($data).PHP_EOL; + echo 'data: ' . OCP\JSON::encode($data) . PHP_EOL; } echo PHP_EOL; flush(); diff --git a/lib/private/json.php b/lib/private/json.php index 6ba0b13806b..8401f7c3a12 100644 --- a/lib/private/json.php +++ b/lib/private/json.php @@ -109,7 +109,14 @@ class OC_JSON{ if($setContentType) { self::setContentTypeHeader(); } + echo self::encode($data); + } + + /** + * Encode JSON + */ + public static function encode($data) { array_walk_recursive($data, array('OC_JSON', 'to_string')); - echo json_encode($data); + return json_encode($data); } } diff --git a/lib/private/memcache/xcache.php b/lib/private/memcache/xcache.php index 33de30562f9..4485f905207 100644 --- a/lib/private/memcache/xcache.php +++ b/lib/private/memcache/xcache.php @@ -44,11 +44,15 @@ class XCache extends Cache { static public function isAvailable(){ if (!extension_loaded('xcache')) { return false; - } elseif (\OC::$CLI) { + } + if (\OC::$CLI) { return false; - }else{ - return true; } + $var_size = (int) ini_get('xcache.var_size'); + if (!$var_size) { + return false; + } + return true; } } diff --git a/lib/private/session/internal.php b/lib/private/session/internal.php index 60aecccc8aa..a7c9e2fdefd 100644 --- a/lib/private/session/internal.php +++ b/lib/private/session/internal.php @@ -26,10 +26,21 @@ class Internal extends Memory { } public function __destruct() { - $_SESSION = $this->data; + $_SESSION = array_merge($_SESSION, $this->data); session_write_close(); } + /** + * @param string $key + */ + public function remove($key) { + // also remove it from $_SESSION to prevent re-setting the old value during the merge + if (isset($_SESSION[$key])) { + unset($_SESSION[$key]); + } + parent::remove($key); + } + public function clear() { session_unset(); @session_regenerate_id(true); diff --git a/lib/private/session/memory.php b/lib/private/session/memory.php index c148ff4b9b9..134cee582ed 100644 --- a/lib/private/session/memory.php +++ b/lib/private/session/memory.php @@ -11,7 +11,7 @@ namespace OC\Session; /** * Class Internal * - * store session data in an in-memory array, not persistance + * store session data in an in-memory array, not persistent * * @package OC\Session */ diff --git a/lib/public/json.php b/lib/public/json.php index 134f724b0e6..831e3ef1cf6 100644 --- a/lib/public/json.php +++ b/lib/public/json.php @@ -169,4 +169,12 @@ class JSON { public static function checkAdminUser() { return(\OC_JSON::checkAdminUser()); } + + /** + * Encode JSON + * @param array $data + */ + public static function encode($data) { + return(\OC_JSON::encode($data)); + } } diff --git a/settings/l10n/es_CL.php b/settings/l10n/es_CL.php new file mode 100644 index 00000000000..86e66bd4825 --- /dev/null +++ b/settings/l10n/es_CL.php @@ -0,0 +1,6 @@ +<?php +$TRANSLATIONS = array( +"Password" => "Clave", +"Username" => "Usuario" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; |