Merge pull request #27063 from nextcloud/Valdnet-patch-4

This commit is contained in:
John Molakvoæ 2021-06-02 17:55:15 +02:00 committed by GitHub
commit c1d359b7a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 30 additions and 30 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -65,7 +65,7 @@
</li> </li>
</Draggable> </Draggable>
<a v-if="isAdmin" :href="appStoreUrl" class="button">{{ t('dashboard', 'Get more widgets from the app store') }}</a> <a v-if="isAdmin" :href="appStoreUrl" class="button">{{ t('dashboard', 'Get more widgets from the App Store') }}</a>
<h3>{{ t('dashboard', 'Change background image') }}</h3> <h3>{{ t('dashboard', 'Change background image') }}</h3>
<BackgroundSettings :background="background" <BackgroundSettings :background="background"

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -247,7 +247,7 @@ class CheckSetupController extends Controller {
return ''; return '';
} }
$features = $this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing'); $features = $this->l10n->t('installing and updating apps via the App Store or Federated Cloud Sharing');
if (!$this->config->getSystemValue('appstoreenabled', true)) { if (!$this->config->getSystemValue('appstoreenabled', true)) {
$features = $this->l10n->t('Federated Cloud Sharing'); $features = $this->l10n->t('Federated Cloud Sharing');
} }

View File

@ -45,14 +45,14 @@ export default {
}, },
enableButtonTooltip() { enableButtonTooltip() {
if (this.app.needsDownload) { if (this.app.needsDownload) {
return t('settings', 'The app will be downloaded from the app store') return t('settings', 'The app will be downloaded from the App Store')
} }
return false return false
}, },
forceEnableButtonTooltip() { forceEnableButtonTooltip() {
const base = t('settings', 'This app is not marked as compatible with your Nextcloud version. If you continue you will still be able to install the app. Note that the app might not work as expected.') const base = t('settings', 'This app is not marked as compatible with your Nextcloud version. If you continue you will still be able to install the app. Note that the app might not work as expected.')
if (this.app.needsDownload) { if (this.app.needsDownload) {
return base + ' ' + t('settings', 'The app will be downloaded from the app store') return base + ' ' + t('settings', 'The app will be downloaded from the App Store')
} }
return base return base
}, },

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -194,7 +194,7 @@ export default {
} }
if (this.appStoreFailed) { if (this.appStoreFailed) {
return t('updatenotification', 'Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore.') return t('updatenotification', 'Could not connect to the App Store or no updates have been returned at all. Search manually for updates or make sure your server has access to the internet and can connect to the App Store.')
} }
return this.missingAppUpdates.length === 0 return this.missingAppUpdates.length === 0

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -20,7 +20,7 @@
<div class="icon icon-add" /> <div class="icon icon-add" />
<div class="actions__item__description"> <div class="actions__item__description">
<h3>{{ t('workflowengine', 'More flows') }}</h3> <h3>{{ t('workflowengine', 'More flows') }}</h3>
<small>{{ t('workflowengine', 'Browse the app store') }}</small> <small>{{ t('workflowengine', 'Browse the App Store') }}</small>
</div> </div>
</a> </a>
</transition-group> </transition-group>

View File

@ -208,10 +208,10 @@ class Upgrade extends Command {
$output->writeln('<info>Checking for update of app ' . $app . ' in appstore</info>'); $output->writeln('<info>Checking for update of app ' . $app . ' in appstore</info>');
}); });
$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($output) { $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($output) {
$output->writeln('<info>Update app ' . $app . ' from appstore</info>'); $output->writeln('<info>Update app ' . $app . ' from App Store</info>');
}); });
$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($output) { $updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($output) {
$output->writeln('<info>Checked for update of app "' . $app . '" in appstore </info>'); $output->writeln('<info>Checked for update of app "' . $app . '" in App Store </info>');
}); });
$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($output) { $updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($output) {
$output->writeln("<info>Checking whether the database schema for <$app> can be updated (this can take a long time depending on the database size)</info>"); $output->writeln("<info>Checking whether the database schema for <$app> can be updated (this can take a long time depending on the database size)</info>");

View File

@ -163,13 +163,13 @@ if (\OCP\Util::needUpgrade()) {
$eventSource->send('success', $l->t('Updated database')); $eventSource->send('success', $l->t('Updated database'));
}); });
$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) { $updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
$eventSource->send('success', $l->t('Checking for update of app "%s" in appstore', [$app])); $eventSource->send('success', $l->t('Checking for update of app "%s" in App Store', [$app]));
}); });
$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) { $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
$eventSource->send('success', $l->t('Update app "%s" from appstore', [$app])); $eventSource->send('success', $l->t('Update app "%s" from App Store', [$app]));
}); });
$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) { $updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
$eventSource->send('success', $l->t('Checked for update of app "%s" in appstore', [$app])); $eventSource->send('success', $l->t('Checked for update of app "%s" in App Store', [$app]));
}); });
$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) { $updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
$eventSource->send('success', $l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app])); $eventSource->send('success', $l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -26,7 +26,7 @@
{{ t('core', 'Loading apps …') }} {{ t('core', 'Loading apps …') }}
</p> </p>
<p v-else-if="loadingAppsError" class="loading-error text-center"> <p v-else-if="loadingAppsError" class="loading-error text-center">
{{ t('core', 'Could not fetch list of apps from the app store.') }} {{ t('core', 'Could not fetch list of apps from the App Store.') }}
</p> </p>
<p v-else class="text-center"> <p v-else class="text-center">
{{ t('core', 'Installing apps …') }} {{ t('core', 'Installing apps …') }}

View File

@ -768,7 +768,7 @@ class OC_Util {
$errors[] = [ $errors[] = [
'error' => $l->t('Cannot write into "apps" directory'), 'error' => $l->t('Cannot write into "apps" directory'),
'hint' => $l->t('This can usually be fixed by giving the webserver write access to the apps directory' 'hint' => $l->t('This can usually be fixed by giving the webserver write access to the apps directory'
. ' or disabling the appstore in the config file.') . ' or disabling the App Store in the config file.')
]; ];
} }
} }