Skip to content

Commit

Permalink
Update translation files
Browse files Browse the repository at this point in the history
Updated by "Squash Git commits" hook in Weblate.

Translation: Matomo/Plugin TwoFactorAuth
Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-twofactorauth/
  • Loading branch information
weblate committed Nov 25, 2024
1 parent c99bf99 commit 93e5d1d
Show file tree
Hide file tree
Showing 27 changed files with 338 additions and 405 deletions.
4 changes: 2 additions & 2 deletions plugins/CoreAdminHome/lang/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@
"WhatIsNewTitle": "Co nowego w Matomo",
"WhatIsNewTooltip": "Dowiedz się, co nowego w Matomo",
"WithOptionalRevenue": "z opcjonalnym zyskiem",
"YouAreNotOptedOut": "Nie zrezygnowałeś z udziału w procesie analityki statystycznej.",
"YouAreNotOptedOut": "Nie wycofano zgody.",
"YouAreOptedOut": "Wykluczono Cię z procesu analityki statystycznej",
"YouMayOptOut": "Możesz wybrać, by nie otrzymywać unikalnego numeru identyfikacyjnego w ciasteczku cookie, przypisanego tylko do Twojego komputera, celem uniknięcia gromadzenia i statystycznej analizy danych na tej stronie.",
"YouMayOptOut2": "Możesz uniemożliwić tej stronie agregowanie i analizowanie działań, które robisz tutaj.",
"YouMayOptOut2": "Możesz uniemożliwić tej stronie agregowanie i analizowanie działań, które tu podejmujesz.",
"YouMayOptOut3": "Takie postępowanie ochroni twoją prywatność, ale uniemożliwi właścicielowi naukę na podstawie twoich działań i poprawienie jakości dla ciebie i innych użytkowników.",
"YouMayOptOutBis": "Aby dokonać tego wyboru, prosimy kliknąć poniżej by uzyskać ciasteczko cookie wyłączające analitykę statystyczną."
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/CoreAdminHome/lang/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"TrackingURL": "İzleme adresi",
"TrustedHostConfirm": "Güvenilir Matomo sunucu adınızı değiştirmek istediğinize emin misiniz?",
"TrustedHostSettings": "Güvenilir Matomo sunucu adı",
"TwoFactorAuth": "İki aşamalı kimlik doğrulaması",
"TwoFactorAuth": "İki adımlı doğrulama",
"UiDemo": "Kullanıcı arayüzü tanıtımı",
"UncheckToOptOut": "İzlemeyi kapatmak için bu kutudaki işareti kaldırın.",
"UpdateSettings": "Ayarları güncelle",
Expand Down
147 changes: 12 additions & 135 deletions plugins/CorePluginsAdmin/vue/dist/CorePluginsAdmin.umd.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions plugins/CorePluginsAdmin/vue/dist/CorePluginsAdmin.umd.min.js

Large diffs are not rendered by default.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
<span v-html="$sanitize(changeLookByManageThemesText)"></span>
</p>
</div>
<InstallAllPaidPluginsButton
/>
</template>

<script lang="ts">
Expand All @@ -40,8 +38,6 @@ import {
translate,
MatomoUrl,
} from 'CoreHome';
import InstallAllPaidPluginsButton
from '../InstallAllPaidPluginsButton/InstallAllPaidPluginsButton.vue';

export default defineComponent({
props: {
Expand All @@ -51,7 +47,6 @@ export default defineComponent({
},
components: {
EnrichedHeadline,
InstallAllPaidPluginsButton,
},
directives: {
ContentIntro,
Expand Down
1 change: 0 additions & 1 deletion plugins/CorePluginsAdmin/vue/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ export { default as PluginName } from './Plugins/PluginName';
export { default as PluginsTable } from './PluginsTable/PluginsTable.vue';
export { default as PluginsTableWithUpdates } from './PluginsTable/PluginsTableWithUpdates.vue';
export { default as UploadPluginDialog } from './UploadPluginDialog/UploadPluginDialog.vue';
export { default as InstallAllPaidPluginsButton } from './InstallAllPaidPluginsButton/InstallAllPaidPluginsButton.vue';
36 changes: 2 additions & 34 deletions plugins/Marketplace/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,21 +151,6 @@ public function manageLicenseKey()
));
}

public function getPaidPluginsToInstallAtOnceParams()
{
Piwik::checkUserHasSuperUserAccess();
Json::sendHeaderJSON();

if (!$this->isInstallAllPaidPluginsVisible()) {
return json_encode([]);
}

return json_encode([
'paidPluginsToInstallAtOnce' => $this->getAllPaidPluginsToInstallAtOnce(),
'installAllPluginsNonce' => Nonce::getNonce(self::INSTALL_NONCE),
], JSON_HEX_APOS);
}

private function getPrettyLongDate($date)
{
if (empty($date)) {
Expand Down Expand Up @@ -269,7 +254,7 @@ public function overview()
'premium' => count($paidPlugins),
];

$view->paidPluginsToInstallAtOnce = $this->getAllPaidPluginsToInstallAtOnce();
$view->paidPluginsToInstallAtOnce = $this->getPaidPluginsToInstallAtOnceData($paidPlugins);
$view->isValidConsumer = $this->consumer->isValidConsumer();
$view->pluginTypeOptions = array(
'plugins' => Piwik::translate('General_Plugins'),
Expand Down Expand Up @@ -307,6 +292,7 @@ public function updateOverview(): string
$paidPlugins = $this->plugins->getAllPaidPlugins();

$updateData = [
'paidPluginsToInstallAtOnce' => $this->getPaidPluginsToInstallAtOnceData($paidPlugins),
'isValidConsumer' => $this->consumer->isValidConsumer(),
];

Expand Down Expand Up @@ -585,22 +571,4 @@ protected function configureViewAndCheckPermission($template)

return $view;
}

private function isInstallAllPaidPluginsVisible(): bool
{
return (
$this->consumer->isValidConsumer() &&
Piwik::hasUserSuperUserAccess() &&
SettingsPiwik::isAutoUpdatePossible() &&
CorePluginsAdmin::isPluginsAdminEnabled() &&
count($this->getAllPaidPluginsToInstallAtOnce()) > 0
);
}

private function getAllPaidPluginsToInstallAtOnce()
{
$paidPlugins = $this->plugins->getAllPaidPlugins();

return $this->getPaidPluginsToInstallAtOnceData($paidPlugins);
}
}
1 change: 1 addition & 0 deletions plugins/Marketplace/templates/overview.twig
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
is-multi-server-environment="{{ isMultiServerEnvironment|default(false)|json_encode }}"
is-plugins-admin-enabled="{{ isPluginsAdminEnabled|default(false)|json_encode }}"
has-some-admin-access="{{ hasSomeAdminAccess|default(false)|json_encode }}"
paid-plugins-to-install-at-once="{{ paidPluginsToInstallAtOnce|default([])|json_encode }}"
install-nonce="{{ installNonce|default(null)|json_encode }}"
activate-nonce="{{ activateNonce|default(null)|json_encode }}"
deactivate-nonce="{{ deactivateNonce|default(null)|json_encode }}"
Expand Down
43 changes: 14 additions & 29 deletions plugins/Marketplace/tests/UI/Marketplace_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,41 +139,26 @@ describe("Marketplace", function () {
});

if (mode === 'superuser') {
[paidPluginsUrl, '?module=Marketplace&action=manageLicenseKey&idSite=1&period=day&date=yesterday', '?module=CorePluginsAdmin&action=plugins&idSite=1&period=day&date=yesterday&activated=']
.forEach(function (url, index) {
it(mode + ' for a user with license key should be able to open paid plugins ' + index, async() => {
var indexArray = ['paidPluginsUrl', 'manageLicenseKeyUrl', 'managePluginsUrl'];
setEnvironment(mode, validLicense);
it(mode + ' for a user with license key should be able to open install purchased plugins modal', async function () {
setEnvironment(mode, validLicense);

await page.goto('about:blank');
await page.goto(url);
await page.goto('about:blank');
await page.goto(paidPluginsUrl);

await captureSelector('paid_plugins_with_license_' + indexArray[index] + '_' + mode, '.pageWrap');
});
const elem = await page.jQuery(
'.installAllPaidPlugins button'
);

await elem.click();

it(mode + ' for a user with license key should be able to open install purchased plugins modal for ' + index, async() => {
var indexArray = ['paidPluginsUrl', 'manageLicenseKeyUrl', 'managePluginsUrl'];
setEnvironment(mode, validLicense);
// give it some time to fetch, animate, and render everything properly
await page.waitForNetworkIdle();
await page.waitForTimeout(500);

await page.goto('about:blank');
await page.goto(url);
await page.waitForNetworkIdle();
await page.waitForTimeout(500);
const selector = '.modal.open';
await page.screenshotSelector(selector);

const elem = await page.jQuery(
'.installAllPaidPluginsAtOnceButton.btn'
);

await elem.click();

// give it some time to fetch, animate, and render everything properly
await page.waitForNetworkIdle();
await page.waitForTimeout(500);

const pageElement = await page.$('.modal.open');
expect(await pageElement.screenshot()).to.matchImage('install_purchased_plugins_modal_' + indexArray[index] + '_' + mode);
});
expect(await page.screenshotSelector(selector)).to.matchImage('install_purchased_plugins_modal_' + mode);
});
}

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 93e5d1d

Please sign in to comment.