diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-10-30 02:44:54 -0700 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2013-10-30 02:44:54 -0700 |
| commit | 4c7ef852524ef41c23446e540e7e531fb1eca8b0 (patch) | |
| tree | f8056a548cffaec72a3330c8e05ef5f8a186a0e9 /apps/files | |
| parent | de342a5ac7bade9416c51bd925504e52c1595334 (diff) | |
| parent | ffb0e14d7b1a900199af6bff93fbee6b8a4340b9 (diff) | |
| download | nextcloud-server-4c7ef852524ef41c23446e540e7e531fb1eca8b0.tar.gz nextcloud-server-4c7ef852524ef41c23446e540e7e531fb1eca8b0.zip | |
Merge pull request #5616 from owncloud/fixing-l10n-master
Fixing l10n master
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/lib/app.php | 2 | ||||
| -rw-r--r-- | apps/files/tests/ajax_rename.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php index 810a9fdd8d1..f5ac11b2168 100644 --- a/apps/files/lib/app.php +++ b/apps/files/lib/app.php @@ -57,7 +57,7 @@ class App { // rename to "/Shared" is denied if( $dir === '/' and $newname === 'Shared' ) { $result['data'] = array( - 'message' => $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved by ownCloud") + 'message' => $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved.") ); // rename to existing file is denied } else if ($this->view->file_exists($dir . '/' . $newname)) { diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php index 8eff978cde0..e654255c407 100644 --- a/apps/files/tests/ajax_rename.php +++ b/apps/files/tests/ajax_rename.php @@ -88,7 +88,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase { $result = $this->files->rename($dir, $oldname, $newname); $expected = array( 'success' => false, - 'data' => array('message' => "Invalid folder name. Usage of 'Shared' is reserved by ownCloud") + 'data' => array('message' => "Invalid folder name. Usage of 'Shared' is reserved.") ); $this->assertEquals($expected, $result); |