diff options
24 files changed, 1060 insertions, 76 deletions
diff --git a/.drone.yml b/.drone.yml index ec43119585f..923eaa27d1f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -235,6 +235,54 @@ pipeline: matrix: DB: mysql PHP: 7.1 + mysql5.6-php5.6: + image: nextcloudci/php5.6:php5.6-7 + commands: + - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql + when: + matrix: + DB: mysql5.6 + PHP: 5.6 + mysql5.6-php7.0: + image: nextcloudci/php7.0:php7.0-13 + commands: + - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql + when: + matrix: + DB: mysql5.6 + PHP: "7.0" + mysql5.6-php7.1: + image: nextcloudci/php7.1:php7.1-12 + commands: + - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql + when: + matrix: + DB: mysql5.6 + PHP: 7.1 + mysql5.5-php5.6: + image: nextcloudci/php5.6:php5.6-7 + commands: + - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql + when: + matrix: + DB: mysql5.5 + PHP: 5.6 + mysql5.5-php7.0: + image: nextcloudci/php7.0:php7.0-13 + commands: + - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql + when: + matrix: + DB: mysql5.5 + PHP: "7.0" + mysql5.5-php7.1: + image: nextcloudci/php7.1:php7.1-12 + commands: + - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql + when: + matrix: + DB: mysql5.5 + PHP: 7.1 postgres-php5.6: image: nextcloudci/php5.6:php5.6-7 commands: @@ -540,6 +588,13 @@ pipeline: when: matrix: TESTS-ACCEPTANCE: app-files + acceptance-app-theming: + image: nextcloudci/integration-php7.0:integration-php7.0-4 + commands: + - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-theming --selenium-server selenium:4444 allow-git-repository-modifications features/app-theming.feature + when: + matrix: + TESTS-ACCEPTANCE: app-theming acceptance-login: image: nextcloudci/integration-php7.0:integration-php7.0-4 commands: @@ -638,6 +693,24 @@ matrix: - DB: mysql PHP: 7.1 ENABLE_REDIS: true + - DB: mysql5.6 + PHP: 5.6 + ENABLE_REDIS: true + - DB: mysql5.6 + PHP: 7.0 + ENABLE_REDIS: true + - DB: mysql5.6 + PHP: 7.1 + ENABLE_REDIS: true + - DB: mysql5.5 + PHP: 5.6 + ENABLE_REDIS: true + - DB: mysql5.5 + PHP: 7.0 + ENABLE_REDIS: true + - DB: mysql5.5 + PHP: 7.1 + ENABLE_REDIS: true - DB: postgres PHP: 5.6 ENABLE_REDIS: true @@ -686,6 +759,8 @@ matrix: - TESTS: acceptance TESTS-ACCEPTANCE: app-files - TESTS: acceptance + TESTS-ACCEPTANCE: app-theming + - TESTS: acceptance TESTS-ACCEPTANCE: login - TESTS: jsunit - TESTS: syntax-php5.6 @@ -728,7 +803,7 @@ services: matrix: DB: postgres mysql: - image: mysql + image: mysql:5.7 environment: - MYSQL_ROOT_PASSWORD=owncloud - MYSQL_USER=oc_autotest @@ -737,6 +812,26 @@ services: when: matrix: DB: mysql + mysql: + image: mysql:5.6 + environment: + - MYSQL_ROOT_PASSWORD=owncloud + - MYSQL_USER=oc_autotest + - MYSQL_PASSWORD=owncloud + - MYSQL_DATABASE=oc_autotest + when: + matrix: + DB: mysql5.6 + mysql: + image: mysql:5.5 + environment: + - MYSQL_ROOT_PASSWORD=owncloud + - MYSQL_USER=oc_autotest + - MYSQL_PASSWORD=owncloud + - MYSQL_DATABASE=oc_autotest + when: + matrix: + DB: mysql5.5 mysqlmb4: image: mysql environment: diff --git a/apps/comments/l10n/et_EE.js b/apps/comments/l10n/et_EE.js index 0979ed0c04b..ddebbc786a4 100644 --- a/apps/comments/l10n/et_EE.js +++ b/apps/comments/l10n/et_EE.js @@ -1,22 +1,29 @@ OC.L10N.register( "comments", { - "Type in a new comment..." : "Kirjuta uus komentaar...", + "Comments" : "Kommentaarid", + "Unknown user" : "Tundmatu kasutaja", + "New comment …" : "Uus kommentaar", "Delete comment" : "Kustuta kommentaar", "Post" : "Postita", "Cancel" : "Loobu", "Edit comment" : "Muuda kommentaari", "[Deleted user]" : "[Kustutatud kasutaja]", - "Comments" : "Kommentaarid", - "No other comments available" : "Ühtegi teist kommentaari pole saadaval", - "More comments..." : "Veel kommentaare...", + "No comments yet, start the conversation!" : "Kommentaare veel pole, alusta vestlust", + "More comments …" : "Veel kommentaare ...", "Save" : "Salvesta", "Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}", - "{count} unread comments" : "{count} lugemata kommentaari", + "Error occurred while retrieving comment with id {id}" : "Kommentaari {id} laadimisel tekkis tõrge", + "Error occurred while updating comment with id {id}" : "Kommentaari {id} uuendamisel tekkis tõrge", + "Error occurred while posting comment" : "Viga kommentaari postitamisel", "Comment" : "Kommentaar", "You commented" : "Sa kommenteerisid", "%1$s commented" : "%1$s kommenteeris", - "You commented on %2$s" : "Sa kommenteerisid %2$s", - "%1$s commented on %2$s" : "%1$s kommenteeris %2$s" + "{author} commented" : "{author} kommenteeris", + "You commented on %1$s" : "Sa kommmenteerisid %1$s", + "You commented on {file}" : "Sa kommenteerisid faili {file}", + "%1$s commented on %2$s" : "%1$s kommenteeris %2$s", + "{author} commented on {file}" : "{author} kommenteeris faili {file}", + "<strong>Comments</strong> for files" : "<strong>kommentaari</strong> ffailidele" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/et_EE.json b/apps/comments/l10n/et_EE.json index 93051ab6ddd..12c44872dfe 100644 --- a/apps/comments/l10n/et_EE.json +++ b/apps/comments/l10n/et_EE.json @@ -1,20 +1,27 @@ { "translations": { - "Type in a new comment..." : "Kirjuta uus komentaar...", + "Comments" : "Kommentaarid", + "Unknown user" : "Tundmatu kasutaja", + "New comment …" : "Uus kommentaar", "Delete comment" : "Kustuta kommentaar", "Post" : "Postita", "Cancel" : "Loobu", "Edit comment" : "Muuda kommentaari", "[Deleted user]" : "[Kustutatud kasutaja]", - "Comments" : "Kommentaarid", - "No other comments available" : "Ühtegi teist kommentaari pole saadaval", - "More comments..." : "Veel kommentaare...", + "No comments yet, start the conversation!" : "Kommentaare veel pole, alusta vestlust", + "More comments …" : "Veel kommentaare ...", "Save" : "Salvesta", "Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}", - "{count} unread comments" : "{count} lugemata kommentaari", + "Error occurred while retrieving comment with id {id}" : "Kommentaari {id} laadimisel tekkis tõrge", + "Error occurred while updating comment with id {id}" : "Kommentaari {id} uuendamisel tekkis tõrge", + "Error occurred while posting comment" : "Viga kommentaari postitamisel", "Comment" : "Kommentaar", "You commented" : "Sa kommenteerisid", "%1$s commented" : "%1$s kommenteeris", - "You commented on %2$s" : "Sa kommenteerisid %2$s", - "%1$s commented on %2$s" : "%1$s kommenteeris %2$s" + "{author} commented" : "{author} kommenteeris", + "You commented on %1$s" : "Sa kommmenteerisid %1$s", + "You commented on {file}" : "Sa kommenteerisid faili {file}", + "%1$s commented on %2$s" : "%1$s kommenteeris %2$s", + "{author} commented on {file}" : "{author} kommenteeris faili {file}", + "<strong>Comments</strong> for files" : "<strong>kommentaari</strong> ffailidele" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_versions/l10n/et_EE.js b/apps/files_versions/l10n/et_EE.js index 5827b02c127..e5f4e59a41a 100644 --- a/apps/files_versions/l10n/et_EE.js +++ b/apps/files_versions/l10n/et_EE.js @@ -4,8 +4,11 @@ OC.L10N.register( "Could not revert: %s" : "Ei suuda taastada faili: %s", "Versions" : "Versioonid", "Failed to revert {file} to revision {timestamp}." : "Ebaõnnestus faili {file} taastamine revisjonile {timestamp}", + "_%n byte_::_%n bytes_" : ["%n bait","%n baiti"], "Restore" : "Taasta", - "More versions..." : "Rohkem versioone...", - "No other versions available" : "Muid versioone pole saadaval" + "No earlier versions available" : "Eelnevaid versioone pole saadaval", + "More versions …" : "Veel versioone ...", + "No versions available" : "Ühtegi versiooni pole saadaval", + "More versions..." : "Rohkem versioone..." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_versions/l10n/et_EE.json b/apps/files_versions/l10n/et_EE.json index 6cfd38102ab..eb5ac1b1636 100644 --- a/apps/files_versions/l10n/et_EE.json +++ b/apps/files_versions/l10n/et_EE.json @@ -2,8 +2,11 @@ "Could not revert: %s" : "Ei suuda taastada faili: %s", "Versions" : "Versioonid", "Failed to revert {file} to revision {timestamp}." : "Ebaõnnestus faili {file} taastamine revisjonile {timestamp}", + "_%n byte_::_%n bytes_" : ["%n bait","%n baiti"], "Restore" : "Taasta", - "More versions..." : "Rohkem versioone...", - "No other versions available" : "Muid versioone pole saadaval" + "No earlier versions available" : "Eelnevaid versioone pole saadaval", + "More versions …" : "Veel versioone ...", + "No versions available" : "Ühtegi versiooni pole saadaval", + "More versions..." : "Rohkem versioone..." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js index 8c2ab2bc08e..d9e66284d14 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -30,7 +30,7 @@ function setThemingValue(setting, value) { OC.generateUrl('/apps/theming/ajax/updateStylesheet'), {'setting' : setting, 'value' : value} ).done(function(response) { hideUndoButton(setting, value); - preview(setting, value); + preview(setting, value, response.data.serverCssUrl); }).fail(function(response) { OC.msg.finishedSaving('#theming_settings_msg', response); $('#theming_settings_loading').hide(); @@ -38,12 +38,12 @@ function setThemingValue(setting, value) { } -function preview(setting, value) { +function preview(setting, value, serverCssUrl) { OC.msg.startAction('#theming_settings_msg', t('theming', 'Loading preview…')); - var stylesheetsLoaded = 2; + var stylesheetsLoaded = 1; var reloadStylesheets = function(cssFile) { var queryString = '?reload=' + new Date().getTime(); - var url = OC.generateUrl(cssFile) + queryString; + var url = cssFile + queryString; var old = $('link[href*="' + cssFile.replace("/","\/") + '"]'); var stylesheet = $("<link/>", { rel: "stylesheet", @@ -62,8 +62,12 @@ function preview(setting, value) { stylesheet.appendTo("head"); }; - reloadStylesheets('/css/core/server.css'); - reloadStylesheets('/apps/theming/styles'); + if (serverCssUrl !== undefined) { + stylesheetsLoaded++; + + reloadStylesheets(serverCssUrl); + } + reloadStylesheets(OC.generateUrl('/apps/theming/styles')); // Preview images var timestamp = new Date().getTime(); @@ -218,7 +222,7 @@ $(document).ready(function () { var input = document.getElementById('theming-'+setting); input.value = response.data.value; } - preview(setting, response.data.value); + preview(setting, response.data.value, response.data.serverCssUrl); }); }); diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php index 225673079a3..b409d309f4d 100644 --- a/apps/theming/lib/Controller/ThemingController.php +++ b/apps/theming/lib/Controller/ThemingController.php @@ -73,6 +73,8 @@ class ThemingController extends Controller { private $appData; /** @var SCSSCacher */ private $scssCacher; + /** @var IURLGenerator */ + private $urlGenerator; /** * ThemingController constructor. @@ -87,6 +89,7 @@ class ThemingController extends Controller { * @param ITempManager $tempManager * @param IAppData $appData * @param SCSSCacher $scssCacher + * @param IURLGenerator $urlGenerator */ public function __construct( $appName, @@ -98,7 +101,8 @@ class ThemingController extends Controller { IL10N $l, ITempManager $tempManager, IAppData $appData, - SCSSCacher $scssCacher + SCSSCacher $scssCacher, + IURLGenerator $urlGenerator ) { parent::__construct($appName, $request); @@ -110,6 +114,7 @@ class ThemingController extends Controller { $this->tempManager = $tempManager; $this->appData = $appData; $this->scssCacher = $scssCacher; + $this->urlGenerator = $urlGenerator; } /** @@ -172,7 +177,8 @@ class ThemingController extends Controller { [ 'data' => [ - 'message' => $this->l10n->t('Saved') + 'message' => $this->l10n->t('Saved'), + 'serverCssUrl' => $this->urlGenerator->linkTo('', $this->scssCacher->getCachedSCSS('core', '/core/css/server.scss')) ], 'status' => 'success' ] @@ -303,7 +309,8 @@ class ThemingController extends Controller { 'data' => [ 'value' => $value, - 'message' => $this->l10n->t('Saved') + 'message' => $this->l10n->t('Saved'), + 'serverCssUrl' => $this->urlGenerator->linkTo('', $this->scssCacher->getCachedSCSS('core', '/core/css/server.scss')) ], 'status' => 'success' ] diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index 5fa8dc51939..5e6e43ca3cb 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -70,6 +70,8 @@ class ThemingControllerTest extends TestCase { private $appData; /** @var SCSSCacher */ private $scssCacher; + /** @var IURLGenerator */ + private $urlGenerator; public function setUp() { $this->request = $this->createMock(IRequest::class); @@ -85,6 +87,7 @@ class ThemingControllerTest extends TestCase { ->willReturn(123); $this->tempManager = \OC::$server->getTempManager(); $this->scssCacher = $this->createMock(SCSSCacher::class); + $this->urlGenerator = $this->createMock(IURLGenerator::class); $this->themingController = new ThemingController( 'theming', @@ -96,39 +99,33 @@ class ThemingControllerTest extends TestCase { $this->l10n, $this->tempManager, $this->appData, - $this->scssCacher + $this->scssCacher, + $this->urlGenerator ); return parent::setUp(); } - public function dataUpdateStylesheet() { + public function dataUpdateStylesheetSuccess() { return [ - ['name', str_repeat('a', 250), 'success', 'Saved'], - ['name', str_repeat('a', 251), 'error', 'The given name is too long'], - ['url', str_repeat('a', 500), 'success', 'Saved'], - ['url', str_repeat('a', 501), 'error', 'The given web address is too long'], - ['slogan', str_repeat('a', 500), 'success', 'Saved'], - ['slogan', str_repeat('a', 501), 'error', 'The given slogan is too long'], - ['color', '#0082c9', 'success', 'Saved'], - ['color', '#0082C9', 'success', 'Saved'], - ['color', '0082C9', 'error', 'The given color is invalid'], - ['color', '#0082Z9', 'error', 'The given color is invalid'], - ['color', 'Nextcloud', 'error', 'The given color is invalid'], + ['name', str_repeat('a', 250), 'Saved'], + ['url', str_repeat('a', 500), 'Saved'], + ['slogan', str_repeat('a', 500), 'Saved'], + ['color', '#0082c9', 'Saved'], + ['color', '#0082C9', 'Saved'], ]; } /** - * @dataProvider dataUpdateStylesheet + * @dataProvider dataUpdateStylesheetSuccess * * @param string $setting * @param string $value - * @param string $status * @param string $message */ - public function testUpdateStylesheet($setting, $value, $status, $message) { + public function testUpdateStylesheetSuccess($setting, $value, $message) { $this->themingDefaults - ->expects($status === 'success' ? $this->once() : $this->never()) + ->expects($this->once()) ->method('set') ->with($setting, $value); $this->l10n @@ -136,13 +133,68 @@ class ThemingControllerTest extends TestCase { ->method('t') ->with($message) ->willReturn($message); + $this->scssCacher + ->expects($this->once()) + ->method('getCachedSCSS') + ->with('core', '/core/css/server.scss') + ->willReturn('/core/css/someHash-server.scss'); + $this->urlGenerator + ->expects($this->once()) + ->method('linkTo') + ->with('', '/core/css/someHash-server.scss') + ->willReturn('/nextcloudWebroot/core/css/someHash-server.scss'); - $expected = new DataResponse([ - 'data' => [ - 'message' => $message, - ], - 'status' => $status, - ]); + $expected = new DataResponse( + [ + 'data' => + [ + 'message' => $message, + 'serverCssUrl' => '/nextcloudWebroot/core/css/someHash-server.scss', + ], + 'status' => 'success', + ] + ); + $this->assertEquals($expected, $this->themingController->updateStylesheet($setting, $value)); + } + + public function dataUpdateStylesheetError() { + return [ + ['name', str_repeat('a', 251), 'The given name is too long'], + ['url', str_repeat('a', 501), 'The given web address is too long'], + ['slogan', str_repeat('a', 501), 'The given slogan is too long'], + ['color', '0082C9', 'The given color is invalid'], + ['color', '#0082Z9', 'The given color is invalid'], + ['color', 'Nextcloud', 'The given color is invalid'], + ]; + } + + /** + * @dataProvider dataUpdateStylesheetError + * + * @param string $setting + * @param string $value + * @param string $message + */ + public function testUpdateStylesheetError($setting, $value, $message) { + $this->themingDefaults + ->expects($this->never()) + ->method('set') + ->with($setting, $value); + $this->l10n + ->expects($this->once()) + ->method('t') + ->with($message) + ->willReturn($message); + + $expected = new DataResponse( + [ + 'data' => + [ + 'message' => $message, + ], + 'status' => 'error', + ] + ); $this->assertEquals($expected, $this->themingController->updateStylesheet($setting, $value)); } @@ -411,6 +463,16 @@ class ThemingControllerTest extends TestCase { ->method('undo') ->with('MySetting') ->willReturn('MyValue'); + $this->scssCacher + ->expects($this->once()) + ->method('getCachedSCSS') + ->with('core', '/core/css/server.scss') + ->willReturn('/core/css/someHash-server.scss'); + $this->urlGenerator + ->expects($this->once()) + ->method('linkTo') + ->with('', '/core/css/someHash-server.scss') + ->willReturn('/nextcloudWebroot/core/css/someHash-server.scss'); $expected = new DataResponse( [ @@ -418,6 +480,7 @@ class ThemingControllerTest extends TestCase { [ 'value' => 'MyValue', 'message' => 'Saved', + 'serverCssUrl' => '/nextcloudWebroot/core/css/someHash-server.scss', ], 'status' => 'success' ] @@ -444,6 +507,16 @@ class ThemingControllerTest extends TestCase { ->method('undo') ->with($value) ->willReturn($value); + $this->scssCacher + ->expects($this->once()) + ->method('getCachedSCSS') + ->with('core', '/core/css/server.scss') + ->willReturn('/core/css/someHash-server.scss'); + $this->urlGenerator + ->expects($this->once()) + ->method('linkTo') + ->with('', '/core/css/someHash-server.scss') + ->willReturn('/nextcloudWebroot/core/css/someHash-server.scss'); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); $this->appData @@ -466,6 +539,7 @@ class ThemingControllerTest extends TestCase { [ 'value' => $value, 'message' => 'Saved', + 'serverCssUrl' => '/nextcloudWebroot/core/css/someHash-server.scss', ], 'status' => 'success' ] diff --git a/apps/user_ldap/lib/ILDAPWrapper.php b/apps/user_ldap/lib/ILDAPWrapper.php index 4034d0baea4..71dd60c3725 100644 --- a/apps/user_ldap/lib/ILDAPWrapper.php +++ b/apps/user_ldap/lib/ILDAPWrapper.php @@ -82,14 +82,14 @@ interface ILDAPWrapper { /** * Return the LDAP error number of the last LDAP command * @param resource $link LDAP link resource - * @return string error message as string + * @return int error code */ public function errno($link); /** * Return the LDAP error message of the last LDAP command * @param resource $link LDAP link resource - * @return int error code as integer + * @return string error message */ public function error($link); diff --git a/apps/user_ldap/lib/LDAP.php b/apps/user_ldap/lib/LDAP.php index ebee0784130..eafd8eacd06 100644 --- a/apps/user_ldap/lib/LDAP.php +++ b/apps/user_ldap/lib/LDAP.php @@ -100,7 +100,7 @@ class LDAP implements ILDAPWrapper { /** * @param LDAP $link - * @return mixed|string + * @return integer */ public function errno($link) { return $this->invokeLDAPMethod('errno', $link); @@ -108,7 +108,7 @@ class LDAP implements ILDAPWrapper { /** * @param LDAP $link - * @return int|mixed + * @return string */ public function error($link) { return $this->invokeLDAPMethod('error', $link); diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php index f6b78208fd2..9d4da9cbf3f 100644 --- a/apps/user_ldap/lib/Wizard.php +++ b/apps/user_ldap/lib/Wizard.php @@ -1019,21 +1019,14 @@ class Wizard extends LDAPUtility { /** * Connects and Binds to an LDAP Server + * * @param int $port the port to connect with * @param bool $tls whether startTLS is to be used - * @param bool $ncc * @return bool * @throws \Exception */ - private function connectAndBind($port = 389, $tls = false, $ncc = false) { - if($ncc) { - //No certificate check - //FIXME: undo afterwards - putenv('LDAPTLS_REQCERT=never'); - } - + private function connectAndBind($port, $tls) { //connect, does not really trigger any server communication - \OCP\Util::writeLog('user_ldap', 'Wiz: Checking Host Info ', \OCP\Util::DEBUG); $host = $this->configuration->ldapHost; $hostInfo = parse_url($host); if(!$hostInfo) { @@ -1045,7 +1038,6 @@ class Wizard extends LDAPUtility { throw new \Exception(self::$l->t('Invalid Host')); } - \OCP\Util::writeLog('user_ldap', 'Wiz: Setting LDAP Options ', \OCP\Util::DEBUG); //set LDAP options $this->ldap->setOption($cr, LDAP_OPT_PROTOCOL_VERSION, 3); $this->ldap->setOption($cr, LDAP_OPT_REFERRALS, 0); @@ -1074,18 +1066,13 @@ class Wizard extends LDAPUtility { if($login === true) { $this->ldap->unbind($cr); - if($ncc) { - throw new \Exception('Certificate cannot be validated.'); - } \OCP\Util::writeLog('user_ldap', 'Wiz: Bind successful to Port '. $port . ' TLS ' . intval($tls), \OCP\Util::DEBUG); return true; } - if($errNo === -1 || ($errNo === 2 && $ncc)) { + if($errNo === -1) { //host, port or TLS wrong return false; - } else if ($errNo === 2) { - return $this->connectAndBind($port, $tls, true); } throw new \Exception($error, $errNo); } diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js new file mode 100644 index 00000000000..9bce8127206 --- /dev/null +++ b/core/l10n/et_EE.js @@ -0,0 +1,272 @@ +OC.L10N.register( + "core", + { + "Please select a file." : "Palun vali fail.", + "File is too big" : "Fail on liiga suur", + "The selected file is not an image." : "Valitud fail ei ole pilt.", + "The selected file cannot be read." : "Valitud faili ei ole võimalik lugeda.", + "Invalid file provided" : "Vigane fail", + "No image or file provided" : "Ühtegi pilti või faili pole pakutud", + "Unknown filetype" : "Tundmatu failitüüp", + "Invalid image" : "Vigane pilt", + "An error occurred. Please contact your admin." : "Tekkis tõrge. Palun võta ühendust administraatoriga.", + "No temporary profile picture available, try again" : "Ühtegi ajutist profiilipilti pole saadaval, proovi uuesti", + "No crop data provided" : "Lõikeandmeid ei leitud", + "No valid crop data provided" : "Kehtivaid lõikeandmeid pole leitud", + "Crop is not square" : "Lõikamine pole ruudukujuline", + "Password reset is disabled" : "Parooli taastamine on välja lülitatud", + "Couldn't reset password because the token is invalid" : "Ei saanud parooli taastada, kuna märgend on vigane", + "Couldn't reset password because the token is expired" : "Parooli ei saanud taastada, sest märgend on aegunud", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Ei saanud saata lähtestamise e-kirja kuna antud kasutajal puudub e-posti aadress. Palun kontakteeruge administraatoriga ", + "Password reset" : "Parooli taastamine ", + "Click the following button to reset your password. If you have not requested the password reset, then ignore this email." : "Kliki allolevale nupule, et taastada oma parool. Kui sa ei ole paroolitaastamist pärinud. siis ignoreeri seda e-kirja.", + "Click the following link to reset your password. If you have not requested the password reset, then ignore this email." : "Kliki allolevale lingile, et taastada oma parool. Kui sa ei ole parooli taastamist pärinud. siis ignoreeri seda e-kirja.", + "Reset your password" : "Lähtesta oma parool", + "%s password reset" : "%s parooli lähtestus", + "Couldn't send reset email. Please contact your administrator." : "Ei suutnud lähtestada e-maili. Palun kontakteeru süsteemihalduriga.", + "Couldn't send reset email. Please make sure your username is correct." : "Ei suutnud lähtestada e-maili. Palun veendu, et kasutajatunnus on õige.", + "Preparing update" : "Uuendamise ettevalmistamine", + "[%d / %d]: %s" : "[%d / %d]: %s", + "Repair warning: " : "Paranda hoiatus:", + "Repair error: " : "Paranda viga:", + "Turned on maintenance mode" : "Haldusrežiimis sisse lülitatud", + "Turned off maintenance mode" : "Haldusrežiimis välja lülitatud", + "Maintenance mode is kept active" : "Hooldusrežiim on aktiivne", + "Updating database schema" : "Andmebaasi skeemi uuendamine", + "Updated database" : "Uuendatud andmebaas", + "Checked database schema update" : "Andmebaasi skeemi uuendus kontrollitud", + "Checking updates of apps" : "Rakenduste uuenduste kontroll", + "Checked database schema update for apps" : "Andmebaasi skeemi uuendus rakendustele on kontrollitud", + "Updated \"%s\" to %s" : "Uuendatud \"%s\" -> %s", + "%s (3rdparty)" : "%s (3nda osapoole arendaja)", + "%s (incompatible)" : "%s (pole ühilduv)", + "Following apps have been disabled: %s" : "Järgnevad rakendused on välja lülitatud: %s", + "Already up to date" : "On juba ajakohane", + "Search contacts …" : "Otsi kontakte", + "No contacts found" : "Kontakte ei leitud", + "Show all contacts …" : "Näita kõiki kontakte", + "There was an error loading your contacts" : "Kontaktide laadimisel tekkis tõrge", + "Loading your contacts …" : "Sinu kontaktide laadimine ...", + "Looking for {term} …" : "Otsin {term} …", + "Settings" : "Seaded", + "Connection to server lost" : "Ühendus serveriga katkes", + "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Tõrge lehe laadimisel, ümberlaadimine %n sekundi pärast","Tõrge lehe laadimisel, ümberlaadimine %n sekundi pärast"], + "Saving..." : "Salvestamine...", + "Dismiss" : "Jäta vahele", + "This action requires you to confirm your password" : "See tegevus nõuab parooli kinnitamist", + "Authentication required" : "Autentimine on vajalik", + "Password" : "Parool", + "Cancel" : "Loobu", + "Confirm" : "Kinnita", + "Failed to authenticate, try again" : "Autentimine ebaõnnestus, proovige uuesti", + "seconds ago" : "sekundit tagasi", + "Logging in …" : "Sisselogimine ...", + "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge<br>.Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.", + "Your files are encrypted. There will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sinu failid on krüpteeritud. Andmete taaastaamine ei ole pärast parooli lähtestaamist enam võimalik. <br />Kui Sa ei ole kindel mida teha, kontakteeru palun enne jätkamist administraatoriga. <br />Kas Sa kindlasti soovid jätkata?", + "I know what I'm doing" : "Ma tean mida teen", + "Password can not be changed. Please contact your administrator." : "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.", + "No" : "Ei", + "Yes" : "Jah", + "No files in here" : "Siin ei ole faile", + "Choose" : "Vali", + "Error loading file picker template: {error}" : "Viga failivalija malli laadimisel: {error}", + "OK" : "OK", + "Error loading message template: {error}" : "Viga sõnumi malli laadimisel: {error}", + "read-only" : "kirjutuskaitstud", + "_{count} file conflict_::_{count} file conflicts_" : ["{count} failikonflikt","{count} failikonflikti"], + "One file conflict" : "Üks failikonflikt", + "New Files" : "Uued failid", + "Already existing files" : "Juba olemasolevad failid", + "Which files do you want to keep?" : "Milliseid faile sa soovid alles hoida?", + "If you select both versions, the copied file will have a number added to its name." : "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number.", + "Continue" : "Jätka", + "(all selected)" : "(kõik valitud)", + "({count} selected)" : "({count} valitud)", + "Error loading file exists template" : "Viga faili olemasolu malli laadimisel", + "Pending" : "Ootel", + "Very weak password" : "Väga nõrk parool", + "Weak password" : "Nõrk parool", + "So-so password" : "Enam-vähem sobiv parool", + "Good password" : "Hea parool", + "Strong password" : "Väga hea parool", + "Error occurred while checking server setup" : "Serveri seadete kontrolimisel tekkis viga", + "Shared" : "Jagatud", + "Shared with {recipients}" : "Jagatud {recipients}", + "Error setting expiration date" : "Viga aegumise kuupäeva määramisel", + "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist", + "Set expiration date" : "Määra aegumise kuupäev", + "Expiration" : "Aegumine", + "Expiration date" : "Aegumise kuupäev", + "Choose a password for the public link" : "Vali avaliku lingi jaoks parool", + "Copied!" : "Kopeeritud!", + "Copy" : "Kopeeri", + "Not supported!" : "Pole toetatud!", + "Press ⌘-C to copy." : "Kopeerimiseks vajuta ⌘ + C.", + "Press Ctrl-C to copy." : "Kopeerimiseks vajuta Ctrl + C.", + "Resharing is not allowed" : "Edasijagamine pole lubatud", + "Share to {name}" : "Jaga kasutajale {name}", + "Share link" : "Jaga linki", + "Link" : "Link", + "Password protect" : "Parooliga kaitstud", + "Allow editing" : "Luba muutmine", + "Email link to person" : "Saada link isikule e-postiga", + "Send" : "Saada", + "Allow upload and editing" : "Luba üleslaadimine ja muutmine", + "Read only" : "kirjutuskaitstud", + "Shared with you and the group {group} by {owner}" : "Jagatud sinu ja {group} grupiga {owner} poolt", + "Shared with you by {owner}" : "Sinuga jagas {owner}", + "group" : "grupp", + "email" : "e-post", + "shared by {sharer}" : "jagatud kasutajalt {sharer}", + "Unshare" : "Lõpeta jagamine", + "Can reshare" : "Võib edasi jagada", + "Can edit" : "Võib redigeerida", + "Can create" : "Võib luua", + "Can change" : "Võib muuta", + "Can delete" : "Võib kustutada", + "Access control" : "Ligipääsukontroll", + "Could not unshare" : "Jagamise lõpetamine ebaõnnestus", + "Error while sharing" : "Viga jagamisel", + "No users or groups found for {search}" : "Otsingu {search} põhjal kasutajaid ega gruppe ei leitud", + "No users found for {search}" : "Otsingu {search} põhjal kasutajaid ei leitud", + "An error occurred. Please try again" : "Tekkis tõrge. Palun proovi uuesti", + "{sharee} (group)" : "{sharee} (group)", + "{sharee} (remote)" : "{sharee} (mujal serveris)", + "Share" : "Jaga", + "Name or email address..." : "Nimi või e-posti aadress", + "Name..." : "Nimi...", + "Error" : "Viga", + "restricted" : "piiratud", + "invisible" : "nähtamatu", + "({scope})" : "({scope})", + "Delete" : "Kustuta", + "Rename" : "Nimeta ümber", + "No tags found" : "Märgendeid ei leitud", + "unknown text" : "tundmatu tekst", + "Hello world!" : "Tere maailm!", + "sunny" : "päikeseline", + "Hello {name}, the weather is {weather}" : "Tere {name}, ilm on {weather}", + "Hello {name}" : "Tere, {name}", + "new" : "uus", + "_download %n file_::_download %n files_" : ["laadi alla %n fail","laadi alla %n faili"], + "Update to {version}" : "Uuenda versioonile {version}", + "An error occurred." : "Tekkis tõrge.", + "Please reload the page." : "Palun laadi see uuesti.", + "Continue to Nextcloud" : "Edasi Nextcloudi", + "Searching other places" : "Otsi teistest kohtadest", + "Personal" : "Isiklik", + "Users" : "Kasutajad", + "Apps" : "Rakendused", + "Admin" : "Admin", + "Help" : "Abiinfo", + "Access forbidden" : "Ligipääs on keelatud", + "File not found" : "Faili ei leitud", + "The specified document has not been found on the server." : "Määratud dokumenti serverist ei leitud.", + "You can click here to return to %s." : "%s tagasi minemiseks võid sa siia klikkida.", + "Internal Server Error" : "Serveri sisemine viga", + "The server encountered an internal error and was unable to complete your request." : "Serveris tekkis sisemine tõrge ja sinu päringu täitmine ebaõnnestus.", + "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kui seda veateadet näidatakse mitu korda, siis palun võta ühendust serveri administraatoriga. Palun lisa alla aruandesse tehnilised üksikasjad.", + "More details can be found in the server log." : "Lisainfot võib leida serveri logist.", + "Technical details" : "Tehnilised andmed", + "Remote Address: %s" : "Kaugaadress: %s", + "Request ID: %s" : "Päringu ID: %s", + "Type: %s" : "Tüüp: %s", + "Code: %s" : "Kood: %s", + "Message: %s" : "Sõnum: %s", + "File: %s" : "Fail: %s", + "Line: %s" : "Rida: %s", + "Trace" : "Jälita", + "Security warning" : "Turvahoiatus", + "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.", + "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>", + "Username" : "Kasutajanimi", + "Storage & database" : "Andmehoidla ja andmebaas", + "Data folder" : "Andmete kaust", + "Configure the database" : "Seadista andmebaasi", + "Only %s is available." : "Ainult %s on saadaval.", + "For more details check out the documentation." : "Lisainfot vaata dokumentatsioonist.", + "Database user" : "Andmebaasi kasutaja", + "Database password" : "Andmebaasi parool", + "Database name" : "Andmebasi nimi", + "Database tablespace" : "Andmebaasi tabeliruum", + "Database host" : "Andmebaasi host", + "Performance warning" : "Kiiruse hoiatus", + "SQLite will be used as database." : "Andmebaasina kasutatakse SQLite", + "Finish setup" : "Lõpeta seadistamine", + "Finishing …" : "Lõpetamine ...", + "Need help?" : "Vajad abi?", + "See the documentation" : "Vaata dokumentatsiooni", + "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "See rakendus vajab toimimiseks JavaScripti. Palun {linkstart}luba JavaScript{linkend} ning laadi see leht uuesti.", + "More apps" : "Veel rakendusi", + "Search" : "Otsi", + "This action requires you to confirm your password:" : "See tegevus nõuab parooli kinnitamist", + "Confirm your password" : "Kinnita oma parool", + "Server side authentication failed!" : "Serveripoolne autentimine ebaõnnestus!", + "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.", + "An internal error occurred." : "Tekkis sisemine tõrge.", + "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.", + "Username or email" : "Kasutajanimi või e-posti aadress", + "Wrong password. Reset it?" : "Vale parool. Kas vajad parooli taastamist?", + "Wrong password." : "Vale parool.", + "Log in" : "Logi sisse", + "Stay logged in" : "Püsi sisselogituna", + "Alternative Logins" : "Alternatiivsed sisselogimisviisid", + "Redirecting …" : "Ümbersuunamine ...", + "New password" : "Uus parool", + "New Password" : "Uus parool", + "Reset password" : "Nulli parool", + "Two-factor authentication" : "Kaheastmeline autentimine", + "Cancel log in" : "Katkesta sisselogimine", + "You are accessing the server from an untrusted domain." : "Sa kasutad serverit usalduseta asukohast", + "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Sõltuvalt sinu seadetest võib ka administraator kasutada allolevat nuppu, et seda domeeni usaldusväärseks märkida.", + "Add \"%s\" as trusted domain" : "Lisa \"%s\" usaldusväärse domeenina", + "App update required" : "Rakenduse uuendus on nõutud", + "%s will be updated to version %s" : "%s uuendatakse versioonile %s", + "These apps will be updated:" : "Neid rakendusi uuendatakse:", + "These incompatible apps will be disabled:" : "Need mitteühilduvad rakendused lülitatakse välja:", + "The theme %s has been disabled." : "Teema %s on keelatud.", + "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enne jätkamist veendu, et andmebaas, seadete ning andmete kataloog on varundatud.", + "Start update" : "Käivita uuendus", + "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Suurtel saitidel aegumise vältimiseks võid sa paigalduskaustas käivitada järgmise käsu:", + "Detailed logs" : "Üksikasjalikud logid", + "Update needed" : "Uuendamine vajaliik", + "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Abiinfo saamiseks vaata <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentatsiooni</a>.", + "Upgrade via web on my own risk" : "Uuenda veebi kaudu omal vastutusel", + "This page will refresh itself when the %s instance is available again." : "Se leht laetakse uuesti, kui %s instantsi on uuesti saadaval.", + "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakteeru oma süsteemihalduriga, kui see teade püsib või on tekkinud ootamatult.", + "Thank you for your patience." : "Täname kannatlikkuse eest.", + "Problem loading page, reloading in 5 seconds" : "Tõrge lehe laadimisel, ümberlaadimine 5 sekundi pärast", + "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. <br />Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. <br />Oled sa kindel, et sa soovid jätkata?", + "Ok" : "Ok", + "Error while unsharing" : "Viga jagamise lõpetamisel", + "can reshare" : "võib edasi jagada", + "can edit" : "saab muuta", + "can create" : "võib luua", + "can change" : "võib muuta", + "can delete" : "võib kustutada", + "access control" : "ligipääsukontroll", + "Share with users or by mail..." : "Jaga kasutajatega või e-postiga ...", + "Share with users or remote users..." : "Jaga kasutajatega või eemal olevate kasutajatega ...", + "Share with users, remote users or by mail..." : "Jaga kasutajatega, eemal olevate kasutajatega või e-postiga ...", + "Share with users or groups..." : "Jaga kasutajate või gruppidega ...", + "Share with users, groups or by mail..." : "Jaga kasutajatega, gruppidega või e-postiga ...", + "Share with users, groups or remote users..." : "Jaga kasutajate, gruppide või eemal olevate kasutajatega ...", + "Share with users, groups, remote users or by mail..." : "Jaga kasutajatega, gruppidega, eemal olevate kasutajatega või e-postiga ...", + "Share with users..." : "Jaga kasutajatega...", + "The object type is not specified." : "Objekti tüüp pole määratletud.", + "Enter new" : "Sisesta uus", + "Add" : "Lisa", + "Edit tags" : "Muuda silte", + "Error loading dialog template: {error}" : "Viga dialoogi malli laadimisel: {error}", + "No tags selected for deletion." : "Kustutamiseks pole ühtegi silti valitud.", + "The update was successful. Redirecting you to Nextcloud now." : "Uuendamine õnnestus. Sind suunatakse Nextcloudi.", + "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Tere,\n\n%s jagas sulle välja %s.\nVaata siit: %s\n\n", + "The share will expire on %s." : "Jagamine aegub %s.", + "Cheers!" : "Terekest!", + "Log out" : "Logi välja", + "Use the following link to reset your password: {link}" : "Kasuta järgnevat linki oma parooli taastamiseks: {link}", + "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>", + "This Nextcloud instance is currently in single user mode." : "See Nextcloud on momendil seadistatud ühe kasutaja jaoks.", + "This means only administrators can use the instance." : "See tähendab, et seda saavad kasutada ainult administraatorid." +}, +"nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json new file mode 100644 index 00000000000..7bc4b92f5d0 --- /dev/null +++ b/core/l10n/et_EE.json @@ -0,0 +1,270 @@ +{ "translations": { + "Please select a file." : "Palun vali fail.", + "File is too big" : "Fail on liiga suur", + "The selected file is not an image." : "Valitud fail ei ole pilt.", + "The selected file cannot be read." : "Valitud faili ei ole võimalik lugeda.", + "Invalid file provided" : "Vigane fail", + "No image or file provided" : "Ühtegi pilti või faili pole pakutud", + "Unknown filetype" : "Tundmatu failitüüp", + "Invalid image" : "Vigane pilt", + "An error occurred. Please contact your admin." : "Tekkis tõrge. Palun võta ühendust administraatoriga.", + "No temporary profile picture available, try again" : "Ühtegi ajutist profiilipilti pole saadaval, proovi uuesti", + "No crop data provided" : "Lõikeandmeid ei leitud", + "No valid crop data provided" : "Kehtivaid lõikeandmeid pole leitud", + "Crop is not square" : "Lõikamine pole ruudukujuline", + "Password reset is disabled" : "Parooli taastamine on välja lülitatud", + "Couldn't reset password because the token is invalid" : "Ei saanud parooli taastada, kuna märgend on vigane", + "Couldn't reset password because the token is expired" : "Parooli ei saanud taastada, sest märgend on aegunud", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Ei saanud saata lähtestamise e-kirja kuna antud kasutajal puudub e-posti aadress. Palun kontakteeruge administraatoriga ", + "Password reset" : "Parooli taastamine ", + "Click the following button to reset your password. If you have not requested the password reset, then ignore this email." : "Kliki allolevale nupule, et taastada oma parool. Kui sa ei ole paroolitaastamist pärinud. siis ignoreeri seda e-kirja.", + "Click the following link to reset your password. If you have not requested the password reset, then ignore this email." : "Kliki allolevale lingile, et taastada oma parool. Kui sa ei ole parooli taastamist pärinud. siis ignoreeri seda e-kirja.", + "Reset your password" : "Lähtesta oma parool", + "%s password reset" : "%s parooli lähtestus", + "Couldn't send reset email. Please contact your administrator." : "Ei suutnud lähtestada e-maili. Palun kontakteeru süsteemihalduriga.", + "Couldn't send reset email. Please make sure your username is correct." : "Ei suutnud lähtestada e-maili. Palun veendu, et kasutajatunnus on õige.", + "Preparing update" : "Uuendamise ettevalmistamine", + "[%d / %d]: %s" : "[%d / %d]: %s", + "Repair warning: " : "Paranda hoiatus:", + "Repair error: " : "Paranda viga:", + "Turned on maintenance mode" : "Haldusrežiimis sisse lülitatud", + "Turned off maintenance mode" : "Haldusrežiimis välja lülitatud", + "Maintenance mode is kept active" : "Hooldusrežiim on aktiivne", + "Updating database schema" : "Andmebaasi skeemi uuendamine", + "Updated database" : "Uuendatud andmebaas", + "Checked database schema update" : "Andmebaasi skeemi uuendus kontrollitud", + "Checking updates of apps" : "Rakenduste uuenduste kontroll", + "Checked database schema update for apps" : "Andmebaasi skeemi uuendus rakendustele on kontrollitud", + "Updated \"%s\" to %s" : "Uuendatud \"%s\" -> %s", + "%s (3rdparty)" : "%s (3nda osapoole arendaja)", + "%s (incompatible)" : "%s (pole ühilduv)", + "Following apps have been disabled: %s" : "Järgnevad rakendused on välja lülitatud: %s", + "Already up to date" : "On juba ajakohane", + "Search contacts …" : "Otsi kontakte", + "No contacts found" : "Kontakte ei leitud", + "Show all contacts …" : "Näita kõiki kontakte", + "There was an error loading your contacts" : "Kontaktide laadimisel tekkis tõrge", + "Loading your contacts …" : "Sinu kontaktide laadimine ...", + "Looking for {term} …" : "Otsin {term} …", + "Settings" : "Seaded", + "Connection to server lost" : "Ühendus serveriga katkes", + "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Tõrge lehe laadimisel, ümberlaadimine %n sekundi pärast","Tõrge lehe laadimisel, ümberlaadimine %n sekundi pärast"], + "Saving..." : "Salvestamine...", + "Dismiss" : "Jäta vahele", + "This action requires you to confirm your password" : "See tegevus nõuab parooli kinnitamist", + "Authentication required" : "Autentimine on vajalik", + "Password" : "Parool", + "Cancel" : "Loobu", + "Confirm" : "Kinnita", + "Failed to authenticate, try again" : "Autentimine ebaõnnestus, proovige uuesti", + "seconds ago" : "sekundit tagasi", + "Logging in …" : "Sisselogimine ...", + "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge<br>.Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.", + "Your files are encrypted. There will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sinu failid on krüpteeritud. Andmete taaastaamine ei ole pärast parooli lähtestaamist enam võimalik. <br />Kui Sa ei ole kindel mida teha, kontakteeru palun enne jätkamist administraatoriga. <br />Kas Sa kindlasti soovid jätkata?", + "I know what I'm doing" : "Ma tean mida teen", + "Password can not be changed. Please contact your administrator." : "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.", + "No" : "Ei", + "Yes" : "Jah", + "No files in here" : "Siin ei ole faile", + "Choose" : "Vali", + "Error loading file picker template: {error}" : "Viga failivalija malli laadimisel: {error}", + "OK" : "OK", + "Error loading message template: {error}" : "Viga sõnumi malli laadimisel: {error}", + "read-only" : "kirjutuskaitstud", + "_{count} file conflict_::_{count} file conflicts_" : ["{count} failikonflikt","{count} failikonflikti"], + "One file conflict" : "Üks failikonflikt", + "New Files" : "Uued failid", + "Already existing files" : "Juba olemasolevad failid", + "Which files do you want to keep?" : "Milliseid faile sa soovid alles hoida?", + "If you select both versions, the copied file will have a number added to its name." : "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number.", + "Continue" : "Jätka", + "(all selected)" : "(kõik valitud)", + "({count} selected)" : "({count} valitud)", + "Error loading file exists template" : "Viga faili olemasolu malli laadimisel", + "Pending" : "Ootel", + "Very weak password" : "Väga nõrk parool", + "Weak password" : "Nõrk parool", + "So-so password" : "Enam-vähem sobiv parool", + "Good password" : "Hea parool", + "Strong password" : "Väga hea parool", + "Error occurred while checking server setup" : "Serveri seadete kontrolimisel tekkis viga", + "Shared" : "Jagatud", + "Shared with {recipients}" : "Jagatud {recipients}", + "Error setting expiration date" : "Viga aegumise kuupäeva määramisel", + "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist", + "Set expiration date" : "Määra aegumise kuupäev", + "Expiration" : "Aegumine", + "Expiration date" : "Aegumise kuupäev", + "Choose a password for the public link" : "Vali avaliku lingi jaoks parool", + "Copied!" : "Kopeeritud!", + "Copy" : "Kopeeri", + "Not supported!" : "Pole toetatud!", + "Press ⌘-C to copy." : "Kopeerimiseks vajuta ⌘ + C.", + "Press Ctrl-C to copy." : "Kopeerimiseks vajuta Ctrl + C.", + "Resharing is not allowed" : "Edasijagamine pole lubatud", + "Share to {name}" : "Jaga kasutajale {name}", + "Share link" : "Jaga linki", + "Link" : "Link", + "Password protect" : "Parooliga kaitstud", + "Allow editing" : "Luba muutmine", + "Email link to person" : "Saada link isikule e-postiga", + "Send" : "Saada", + "Allow upload and editing" : "Luba üleslaadimine ja muutmine", + "Read only" : "kirjutuskaitstud", + "Shared with you and the group {group} by {owner}" : "Jagatud sinu ja {group} grupiga {owner} poolt", + "Shared with you by {owner}" : "Sinuga jagas {owner}", + "group" : "grupp", + "email" : "e-post", + "shared by {sharer}" : "jagatud kasutajalt {sharer}", + "Unshare" : "Lõpeta jagamine", + "Can reshare" : "Võib edasi jagada", + "Can edit" : "Võib redigeerida", + "Can create" : "Võib luua", + "Can change" : "Võib muuta", + "Can delete" : "Võib kustutada", + "Access control" : "Ligipääsukontroll", + "Could not unshare" : "Jagamise lõpetamine ebaõnnestus", + "Error while sharing" : "Viga jagamisel", + "No users or groups found for {search}" : "Otsingu {search} põhjal kasutajaid ega gruppe ei leitud", + "No users found for {search}" : "Otsingu {search} põhjal kasutajaid ei leitud", + "An error occurred. Please try again" : "Tekkis tõrge. Palun proovi uuesti", + "{sharee} (group)" : "{sharee} (group)", + "{sharee} (remote)" : "{sharee} (mujal serveris)", + "Share" : "Jaga", + "Name or email address..." : "Nimi või e-posti aadress", + "Name..." : "Nimi...", + "Error" : "Viga", + "restricted" : "piiratud", + "invisible" : "nähtamatu", + "({scope})" : "({scope})", + "Delete" : "Kustuta", + "Rename" : "Nimeta ümber", + "No tags found" : "Märgendeid ei leitud", + "unknown text" : "tundmatu tekst", + "Hello world!" : "Tere maailm!", + "sunny" : "päikeseline", + "Hello {name}, the weather is {weather}" : "Tere {name}, ilm on {weather}", + "Hello {name}" : "Tere, {name}", + "new" : "uus", + "_download %n file_::_download %n files_" : ["laadi alla %n fail","laadi alla %n faili"], + "Update to {version}" : "Uuenda versioonile {version}", + "An error occurred." : "Tekkis tõrge.", + "Please reload the page." : "Palun laadi see uuesti.", + "Continue to Nextcloud" : "Edasi Nextcloudi", + "Searching other places" : "Otsi teistest kohtadest", + "Personal" : "Isiklik", + "Users" : "Kasutajad", + "Apps" : "Rakendused", + "Admin" : "Admin", + "Help" : "Abiinfo", + "Access forbidden" : "Ligipääs on keelatud", + "File not found" : "Faili ei leitud", + "The specified document has not been found on the server." : "Määratud dokumenti serverist ei leitud.", + "You can click here to return to %s." : "%s tagasi minemiseks võid sa siia klikkida.", + "Internal Server Error" : "Serveri sisemine viga", + "The server encountered an internal error and was unable to complete your request." : "Serveris tekkis sisemine tõrge ja sinu päringu täitmine ebaõnnestus.", + "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kui seda veateadet näidatakse mitu korda, siis palun võta ühendust serveri administraatoriga. Palun lisa alla aruandesse tehnilised üksikasjad.", + "More details can be found in the server log." : "Lisainfot võib leida serveri logist.", + "Technical details" : "Tehnilised andmed", + "Remote Address: %s" : "Kaugaadress: %s", + "Request ID: %s" : "Päringu ID: %s", + "Type: %s" : "Tüüp: %s", + "Code: %s" : "Kood: %s", + "Message: %s" : "Sõnum: %s", + "File: %s" : "Fail: %s", + "Line: %s" : "Rida: %s", + "Trace" : "Jälita", + "Security warning" : "Turvahoiatus", + "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.", + "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>", + "Username" : "Kasutajanimi", + "Storage & database" : "Andmehoidla ja andmebaas", + "Data folder" : "Andmete kaust", + "Configure the database" : "Seadista andmebaasi", + "Only %s is available." : "Ainult %s on saadaval.", + "For more details check out the documentation." : "Lisainfot vaata dokumentatsioonist.", + "Database user" : "Andmebaasi kasutaja", + "Database password" : "Andmebaasi parool", + "Database name" : "Andmebasi nimi", + "Database tablespace" : "Andmebaasi tabeliruum", + "Database host" : "Andmebaasi host", + "Performance warning" : "Kiiruse hoiatus", + "SQLite will be used as database." : "Andmebaasina kasutatakse SQLite", + "Finish setup" : "Lõpeta seadistamine", + "Finishing …" : "Lõpetamine ...", + "Need help?" : "Vajad abi?", + "See the documentation" : "Vaata dokumentatsiooni", + "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "See rakendus vajab toimimiseks JavaScripti. Palun {linkstart}luba JavaScript{linkend} ning laadi see leht uuesti.", + "More apps" : "Veel rakendusi", + "Search" : "Otsi", + "This action requires you to confirm your password:" : "See tegevus nõuab parooli kinnitamist", + "Confirm your password" : "Kinnita oma parool", + "Server side authentication failed!" : "Serveripoolne autentimine ebaõnnestus!", + "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.", + "An internal error occurred." : "Tekkis sisemine tõrge.", + "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.", + "Username or email" : "Kasutajanimi või e-posti aadress", + "Wrong password. Reset it?" : "Vale parool. Kas vajad parooli taastamist?", + "Wrong password." : "Vale parool.", + "Log in" : "Logi sisse", + "Stay logged in" : "Püsi sisselogituna", + "Alternative Logins" : "Alternatiivsed sisselogimisviisid", + "Redirecting …" : "Ümbersuunamine ...", + "New password" : "Uus parool", + "New Password" : "Uus parool", + "Reset password" : "Nulli parool", + "Two-factor authentication" : "Kaheastmeline autentimine", + "Cancel log in" : "Katkesta sisselogimine", + "You are accessing the server from an untrusted domain." : "Sa kasutad serverit usalduseta asukohast", + "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Sõltuvalt sinu seadetest võib ka administraator kasutada allolevat nuppu, et seda domeeni usaldusväärseks märkida.", + "Add \"%s\" as trusted domain" : "Lisa \"%s\" usaldusväärse domeenina", + "App update required" : "Rakenduse uuendus on nõutud", + "%s will be updated to version %s" : "%s uuendatakse versioonile %s", + "These apps will be updated:" : "Neid rakendusi uuendatakse:", + "These incompatible apps will be disabled:" : "Need mitteühilduvad rakendused lülitatakse välja:", + "The theme %s has been disabled." : "Teema %s on keelatud.", + "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enne jätkamist veendu, et andmebaas, seadete ning andmete kataloog on varundatud.", + "Start update" : "Käivita uuendus", + "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Suurtel saitidel aegumise vältimiseks võid sa paigalduskaustas käivitada järgmise käsu:", + "Detailed logs" : "Üksikasjalikud logid", + "Update needed" : "Uuendamine vajaliik", + "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Abiinfo saamiseks vaata <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentatsiooni</a>.", + "Upgrade via web on my own risk" : "Uuenda veebi kaudu omal vastutusel", + "This page will refresh itself when the %s instance is available again." : "Se leht laetakse uuesti, kui %s instantsi on uuesti saadaval.", + "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakteeru oma süsteemihalduriga, kui see teade püsib või on tekkinud ootamatult.", + "Thank you for your patience." : "Täname kannatlikkuse eest.", + "Problem loading page, reloading in 5 seconds" : "Tõrge lehe laadimisel, ümberlaadimine 5 sekundi pärast", + "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. <br />Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. <br />Oled sa kindel, et sa soovid jätkata?", + "Ok" : "Ok", + "Error while unsharing" : "Viga jagamise lõpetamisel", + "can reshare" : "võib edasi jagada", + "can edit" : "saab muuta", + "can create" : "võib luua", + "can change" : "võib muuta", + "can delete" : "võib kustutada", + "access control" : "ligipääsukontroll", + "Share with users or by mail..." : "Jaga kasutajatega või e-postiga ...", + "Share with users or remote users..." : "Jaga kasutajatega või eemal olevate kasutajatega ...", + "Share with users, remote users or by mail..." : "Jaga kasutajatega, eemal olevate kasutajatega või e-postiga ...", + "Share with users or groups..." : "Jaga kasutajate või gruppidega ...", + "Share with users, groups or by mail..." : "Jaga kasutajatega, gruppidega või e-postiga ...", + "Share with users, groups or remote users..." : "Jaga kasutajate, gruppide või eemal olevate kasutajatega ...", + "Share with users, groups, remote users or by mail..." : "Jaga kasutajatega, gruppidega, eemal olevate kasutajatega või e-postiga ...", + "Share with users..." : "Jaga kasutajatega...", + "The object type is not specified." : "Objekti tüüp pole määratletud.", + "Enter new" : "Sisesta uus", + "Add" : "Lisa", + "Edit tags" : "Muuda silte", + "Error loading dialog template: {error}" : "Viga dialoogi malli laadimisel: {error}", + "No tags selected for deletion." : "Kustutamiseks pole ühtegi silti valitud.", + "The update was successful. Redirecting you to Nextcloud now." : "Uuendamine õnnestus. Sind suunatakse Nextcloudi.", + "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Tere,\n\n%s jagas sulle välja %s.\nVaata siit: %s\n\n", + "The share will expire on %s." : "Jagamine aegub %s.", + "Cheers!" : "Terekest!", + "Log out" : "Logi välja", + "Use the following link to reset your password: {link}" : "Kasuta järgnevat linki oma parooli taastamiseks: {link}", + "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>", + "This Nextcloud instance is currently in single user mode." : "See Nextcloud on momendil seadistatud ühe kasutaja jaoks.", + "This means only administrators can use the instance." : "See tähendab, et seda saavad kasutada ainult administraatorid." +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 2df64663d6f..e4e4ffd159d 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -758,6 +758,7 @@ return array( 'OC\\Repair\\NC12\\UpdateLanguageCodes' => $baseDir . '/lib/private/Repair/NC12/UpdateLanguageCodes.php', 'OC\\Repair\\NC13\\RepairInvalidPaths' => $baseDir . '/lib/private/Repair/NC13/RepairInvalidPaths.php', 'OC\\Repair\\OldGroupMembershipShares' => $baseDir . '/lib/private/Repair/OldGroupMembershipShares.php', + 'OC\\Repair\\Owncloud\\DropAccountTermsTable' => $baseDir . '/lib/private/Repair/Owncloud/DropAccountTermsTable.php', 'OC\\Repair\\Owncloud\\SaveAccountsTableData' => $baseDir . '/lib/private/Repair/Owncloud/SaveAccountsTableData.php', 'OC\\Repair\\RemoveRootShares' => $baseDir . '/lib/private/Repair/RemoveRootShares.php', 'OC\\Repair\\RepairInvalidShares' => $baseDir . '/lib/private/Repair/RepairInvalidShares.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 9f87c1060a2..a349650866a 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -788,6 +788,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Repair\\NC12\\UpdateLanguageCodes' => __DIR__ . '/../../..' . '/lib/private/Repair/NC12/UpdateLanguageCodes.php', 'OC\\Repair\\NC13\\RepairInvalidPaths' => __DIR__ . '/../../..' . '/lib/private/Repair/NC13/RepairInvalidPaths.php', 'OC\\Repair\\OldGroupMembershipShares' => __DIR__ . '/../../..' . '/lib/private/Repair/OldGroupMembershipShares.php', + 'OC\\Repair\\Owncloud\\DropAccountTermsTable' => __DIR__ . '/../../..' . '/lib/private/Repair/Owncloud/DropAccountTermsTable.php', 'OC\\Repair\\Owncloud\\SaveAccountsTableData' => __DIR__ . '/../../..' . '/lib/private/Repair/Owncloud/SaveAccountsTableData.php', 'OC\\Repair\\RemoveRootShares' => __DIR__ . '/../../..' . '/lib/private/Repair/RemoveRootShares.php', 'OC\\Repair\\RepairInvalidShares' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairInvalidShares.php', diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php index c19427e5f9b..0577093712e 100644 --- a/lib/private/Files/Storage/Local.php +++ b/lib/private/Files/Storage/Local.php @@ -412,6 +412,12 @@ class Local extends \OC\Files\Storage\Common { */ public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) { if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Local')) { + if ($sourceStorage->instanceOfStorage(Jail::class)) { + /** + * @var \OC\Files\Storage\Wrapper\Jail $sourceStorage + */ + $sourceInternalPath = $sourceStorage->getUnjailedPath($sourceInternalPath); + } /** * @var \OC\Files\Storage\Local $sourceStorage */ diff --git a/lib/private/Repair.php b/lib/private/Repair.php index dae328e6340..6cfc8ddf4ad 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -40,6 +40,7 @@ use OC\Repair\NC11\MoveAvatars; use OC\Repair\NC12\InstallCoreBundle; use OC\Repair\NC12\UpdateLanguageCodes; use OC\Repair\OldGroupMembershipShares; +use OC\Repair\Owncloud\DropAccountTermsTable; use OC\Repair\Owncloud\SaveAccountsTableData; use OC\Repair\RemoveRootShares; use OC\Repair\NC13\RepairInvalidPaths; @@ -174,6 +175,7 @@ class Repair implements IOutput{ new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true), new SqliteAutoincrement($connection), new SaveAccountsTableData($connection, $config), + new DropAccountTermsTable($connection), ]; return $steps; diff --git a/lib/private/Repair/Owncloud/DropAccountTermsTable.php b/lib/private/Repair/Owncloud/DropAccountTermsTable.php new file mode 100644 index 00000000000..0b1b64c3a3a --- /dev/null +++ b/lib/private/Repair/Owncloud/DropAccountTermsTable.php @@ -0,0 +1,60 @@ +<?php +/** + * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com> + * + * @author Joas Schilling <coding@schilljs.com> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OC\Repair\Owncloud; + +use OCP\IDBConnection; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; + +class DropAccountTermsTable implements IRepairStep { + + /** @var IDBConnection */ + protected $db; + + /** + * @param IDBConnection $db + */ + public function __construct(IDBConnection $db) { + $this->db = $db; + } + + /** + * @return string + */ + public function getName() { + return 'Drop account terms table when migrating from ownCloud'; + } + + /** + * @param IOutput $output + */ + public function run(IOutput $output) { + if (!$this->db->tableExists('account_terms')) { + return; + } + + $this->db->dropTable('account_terms'); + } +} + diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 902d22f6679..91ac5c665b3 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -200,9 +200,7 @@ class Updater extends BasicEmitter { '11.0.0.10', ], true)) { $currentVendor = 'nextcloud'; - } else if (in_array($oldVersion, [ - '10.0.0.12', - ], true)) { + } else if (isset($allowedPreviousVersions['owncloud'][$oldVersion])) { $currentVendor = 'owncloud'; } } diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml index f9412935e51..10e1d425022 100644 --- a/tests/acceptance/config/behat.yml +++ b/tests/acceptance/config/behat.yml @@ -17,6 +17,7 @@ default: - NotificationContext - SettingsContext - SettingsMenuContext + - ThemingAppContext - UsersSettingsContext extensions: Behat\MinkExtension: diff --git a/tests/acceptance/features/app-theming.feature b/tests/acceptance/features/app-theming.feature new file mode 100644 index 00000000000..9f5ac3f6a42 --- /dev/null +++ b/tests/acceptance/features/app-theming.feature @@ -0,0 +1,23 @@ +Feature: app-theming + + Scenario: changing the color updates the header color + Given I am logged in as the admin + And I visit the settings page + And I open the "Theming" section + And I see that the color selector in the Theming app has loaded + And I see that the header color is "0082C9" + When I set the "Color" parameter in the Theming app to "C9C9C9" + Then I see that the parameters in the Theming app are eventually saved + And I see that the header color is "C9C9C9" + + Scenario: resetting the color updates the header color + Given I am logged in as the admin + And I visit the settings page + And I open the "Theming" section + And I see that the color selector in the Theming app has loaded + And I set the "Color" parameter in the Theming app to "C9C9C9" + And I see that the parameters in the Theming app are eventually saved + And I see that the header color is "C9C9C9" + When I reset the "Color" parameter in the Theming app to its default value + Then I see that the parameters in the Theming app are eventually saved + And I see that the header color is "0082C9" diff --git a/tests/acceptance/features/bootstrap/ThemingAppContext.php b/tests/acceptance/features/bootstrap/ThemingAppContext.php new file mode 100644 index 00000000000..a36ce7b297e --- /dev/null +++ b/tests/acceptance/features/bootstrap/ThemingAppContext.php @@ -0,0 +1,154 @@ +<?php + +/** + * + * @copyright Copyright (c) 2017, Daniel Calviño Sánchez (danxuliu@gmail.com) + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +use Behat\Behat\Context\Context; + +class ThemingAppContext implements Context, ActorAwareInterface { + + use ActorAware; + + /** + * @return Locator + */ + public static function inputFieldFor($parameterName) { + return Locator::forThe()->css("input")-> + descendantOf(self::parameterDivFor($parameterName))-> + describedAs("Input field for $parameterName parameter in Theming app"); + } + + /** + * @return Locator + */ + public static function resetButtonFor($parameterName) { + return Locator::forThe()->css(".theme-undo")-> + descendantOf(self::parameterDivFor($parameterName))-> + describedAs("Reset button for $parameterName parameter in Theming app"); + } + + /** + * @return Locator + */ + private static function parameterDivFor($parameterName) { + return Locator::forThe()->xpath("//*[@id='theming']//label//*[normalize-space() = '$parameterName']/ancestor::div[1]")-> + describedAs("Div for $parameterName parameter in Theming app"); + } + + /** + * @return Locator + */ + public static function statusMessage() { + return Locator::forThe()->id("theming_settings_msg")-> + describedAs("Status message in Theming app"); + } + + /** + * @When I set the :parameterName parameter in the Theming app to :parameterValue + */ + public function iSetTheParameterInTheThemingAppTo($parameterName, $parameterValue) { + $this->actor->find(self::inputFieldFor($parameterName), 10)->setValue($parameterValue . "\r"); + } + + /** + * @When I reset the :parameterName parameter in the Theming app to its default value + */ + public function iSetTheParameterInTheThemingAppToItsDefaultValue($parameterName) { + // The reset button is not shown when the cursor is outside the input + // field, so ensure that the cursor is on the input field by clicking on + // it. + $this->actor->find(self::inputFieldFor($parameterName), 10)->click(); + + $this->actor->find(self::resetButtonFor($parameterName), 10)->click(); + } + + /** + * @Then I see that the color selector in the Theming app has loaded + */ + public function iSeeThatTheColorSelectorInTheThemingAppHasLoaded() { + // When the color selector is loaded it removes the leading '#' from the + // value property of the input field object it is linked to, and changes + // the background color of the input field to that value. The only way + // to know that the color selector has loaded is to look for any of + // those changes. + + PHPUnit_Framework_Assert::assertTrue($this->actor->find(self::inputFieldFor("Color"), 10)->isVisible()); + + $actor = $this->actor; + + $colorSelectorLoadedCallback = function() use($actor) { + $colorSelectorValue = $actor->getSession()->evaluateScript("return $('#theming-color')[0].value;"); + + if ($colorSelectorValue[0] === '#') { + return false; + } + + return true; + }; + + if (!Utils::waitFor($colorSelectorLoadedCallback, $timeout = 10 * $this->actor->getFindTimeoutMultiplier(), $timeoutStep = 1)) { + PHPUnit_Framework_Assert::fail("The color selector in Theming app has not been loaded after $timeout seconds"); + } + } + + /** + * @Then I see that the header color is :color + */ + public function iSeeThatTheHeaderColorIs($color) { + $headerColor = $this->actor->getSession()->evaluateScript("return $('#header').css('background-color');"); + + if ($headerColor[0] === '#') { + $headerColor = substr($headerColor, 1); + } else if (preg_match("/rgb\(\s*(\d+),\s*(\d+),\s*(\d+)\)/", $headerColor, $matches)) { + // Convert from hex string to RGB array + $color = sscanf($color, "%02X%02X%02X"); + + // Convert from "rgb(R, G, B)" string to RGB array + $headerColor = array_splice($matches, 1); + } else { + PHPUnit_Framework_Assert::fail("The acceptance test does not know how to handle the color string returned by the browser: $headerColor"); + } + + PHPUnit_Framework_Assert::assertEquals($color, $headerColor); + } + + /** + * @Then I see that the parameters in the Theming app are eventually saved + */ + public function iSeeThatTheParametersInTheThemingAppAreEventuallySaved() { + PHPUnit_Framework_Assert::assertTrue($this->actor->find(self::statusMessage(), 10)->isVisible()); + + $actor = $this->actor; + + $savedStatusMessageShownCallback = function() use($actor) { + if ($actor->find(self::statusMessage())->getText() !== "Saved") { + return false; + } + + return true; + }; + + if (!Utils::waitFor($savedStatusMessageShownCallback, $timeout = 10 * $this->actor->getFindTimeoutMultiplier(), $timeoutStep = 1)) { + PHPUnit_Framework_Assert::fail("The 'Saved' status messages in Theming app has not been shown after $timeout seconds"); + } + } + +} diff --git a/tests/acceptance/features/core/Actor.php b/tests/acceptance/features/core/Actor.php index a87ccfb7737..bf2f5a7367d 100644 --- a/tests/acceptance/features/core/Actor.php +++ b/tests/acceptance/features/core/Actor.php @@ -105,6 +105,15 @@ class Actor { } /** + * Returns the multiplier for find timeouts. + * + * @return float the multiplier to apply to find timeouts. + */ + public function getFindTimeoutMultiplier() { + return $this->findTimeoutMultiplier; + } + + /** * Sets the multiplier for find timeouts. * * @param float $findTimeoutMultiplier the multiplier to apply to find diff --git a/version.php b/version.php index 649c8ae7389..03c03f43c8c 100644 --- a/version.php +++ b/version.php @@ -26,7 +26,7 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(13, 0, 0, 2); +$OC_Version = array(13, 0, 0, 3); // The human readable string $OC_VersionString = '13.0.0 alpha'; |