From 5727a0dbe096ae0e5bba2488b3f7b14751fe1dd9 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 13 Jun 2016 18:53:51 +0200 Subject: [PATCH 1/3] Remove translate link We don't have any translation platform yet --- settings/templates/personal.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 11dc0d7881..70b7cfd083 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -159,12 +159,6 @@ if($_['passwordChangeSupported']) { - - - t('Help translate'));?> - -
@@ -185,11 +179,11 @@ if($_['passwordChangeSupported']) {

t('If you want to support the project - join development or - spread the word!'));?> + help other users!'));?>

From 7e5b0ad24904fe3580cc77a9e552791a5fca9839 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 13 Jun 2016 19:33:27 +0200 Subject: [PATCH 2/3] Do not link to ownCloud Federation page --- apps/files_sharing/settings-personal.php | 8 +------- apps/files_sharing/templates/settings-personal.php | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php index 982a8b05c1..5a839e91c1 100644 --- a/apps/files_sharing/settings-personal.php +++ b/apps/files_sharing/settings-personal.php @@ -25,12 +25,6 @@ $l = \OC::$server->getL10N('files_sharing'); -$isIE8 = false; -preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches); -if (count($matches) > 0 && $matches[1] <= 9) { - $isIE8 = true; -} - $cloudID = \OC::$server->getUserSession()->getUser()->getCloudId(); $url = 'https://owncloud.org/federation#' . $cloudID; $ownCloudLogoPath = \OC::$server->getURLGenerator()->imagePath('core', 'logo-icon.svg'); @@ -42,6 +36,6 @@ $tmpl->assign('message_without_URL', $l->t('Share with me through my #ownCloud F $tmpl->assign('owncloud_logo_path', $ownCloudLogoPath); $tmpl->assign('reference', $url); $tmpl->assign('cloudId', $cloudID); -$tmpl->assign('showShareIT', !$isIE8); +$tmpl->assign('showShareIT', false); return $tmpl->fetchPage(); diff --git a/apps/files_sharing/templates/settings-personal.php b/apps/files_sharing/templates/settings-personal.php index 32f358765c..f0bbf2d935 100644 --- a/apps/files_sharing/templates/settings-personal.php +++ b/apps/files_sharing/templates/settings-personal.php @@ -57,7 +57,7 @@ if ($_['showShareIT']) { style="padding:10px;background-color:#0082c9;color:#fff;border-radius:3px;padding-left:4px;"> - t('Share with me via ownCloud')); ?> + t('Share with me via Nextcloud')); ?>

@@ -67,7 +67,7 @@ if ($_['showShareIT']) { style="padding:10px;background-color:#0082c9;color:#fff;border-radius:3px;padding-left:4px;"> - t('Share with me via ownCloud')); ?> + t('Share with me via Nextcloud')); ?>

From 9adc2bd5ef5103b631943a7998d3af3e7984e610 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 13 Jun 2016 19:35:05 +0200 Subject: [PATCH 3/3] Adjust url to Nc docs --- settings/templates/apps.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/settings/templates/apps.php b/settings/templates/apps.php index ef89a5393c..02c17a489a 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -31,7 +31,7 @@ script(
  • - t('Developer documentation'));?> ↗ + t('Developer documentation'));?> ↗
  • @@ -103,12 +103,12 @@ script( {{#if missingMinOwnCloudVersion}}
    -

    t('This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?>

    +

    t('This app has no minimum Nextcloud version assigned. This will be an error in Nextcloud 11 and later.')); ?>

    {{else}} {{#if missingMaxOwnCloudVersion}}
    -

    t('This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?>

    +

    t('This app has no maximum Nextcloud version assigned. This will be an error in Nextcloud 11 and later.')); ?>

    {{/if}} {{/if}}