diff --git a/app/DoctrineMigrations/Version20230728085538.php b/app/DoctrineMigrations/Version20230728085538.php new file mode 100644 index 000000000..0ee97bd58 --- /dev/null +++ b/app/DoctrineMigrations/Version20230728085538.php @@ -0,0 +1,26 @@ +addSql('DELETE FROM' . $this->getTable('internal_setting') . " WHERE name = 'demo_mode_enabled';"); + $this->addSql('DELETE FROM' . $this->getTable('internal_setting') . " WHERE name = 'demo_mode_username';"); + } + + public function down(Schema $schema): void + { + $this->addSql('INSERT INTO ' . $this->getTable('internal_setting') . " (name, value, section) VALUES ('demo_mode_enabled', '0', 'misc');"); + $this->addSql('INSERT INTO ' . $this->getTable('internal_setting') . " (name, value, section) VALUES ('demo_mode_username', 'wallabag', 'misc');"); + } +} diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 2fb20b31f..bbbe46939 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -129,14 +129,6 @@ wallabag_core: name: matomo_site_id value: 1 section: analytics - - - name: demo_mode_enabled - value: 0 - section: misc - - - name: demo_mode_username - value: wallabag - section: misc - name: download_images_enabled value: 0 diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 03db7390e..577621026 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -90,14 +90,10 @@ class ConfigController extends AbstractController $pwdForm->handleRequest($request); if ($pwdForm->isSubmitted() && $pwdForm->isValid()) { - if ($craueConfig->get('demo_mode_enabled') && $craueConfig->get('demo_mode_username') === $user->getUsername()) { - $message = 'flashes.config.notice.password_not_updated_demo'; - } else { - $message = 'flashes.config.notice.password_updated'; + $message = 'flashes.config.notice.password_updated'; - $user->setPlainPassword($pwdForm->get('new_password')->getData()); - $this->userManager->updateUser($user, true); - } + $user->setPlainPassword($pwdForm->get('new_password')->getData()); + $this->userManager->updateUser($user, true); $this->addFlash('notice', $message); diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php index 9174daf85..21a13b875 100644 --- a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php @@ -2,7 +2,6 @@ namespace Tests\Wallabag\CoreBundle\Controller; -use Craue\ConfigBundle\Util\Config; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\Session\SessionInterface; @@ -736,36 +735,6 @@ class ConfigControllerTest extends WallabagCoreTestCase $this->assertStringContainsString('You can not access this rule', $body[0]); } - public function testDemoMode() - { - $this->logInAs('admin'); - $client = $this->getTestClient(); - - $config = $client->getContainer()->get(Config::class); - $config->set('demo_mode_enabled', 1); - $config->set('demo_mode_username', 'admin'); - - $crawler = $client->request('GET', '/config'); - - $this->assertSame(200, $client->getResponse()->getStatusCode()); - - $form = $crawler->filter('button[id=change_passwd_save]')->form(); - - $data = [ - 'change_passwd[old_password]' => 'mypassword', - 'change_passwd[new_password][first]' => 'mypassword', - 'change_passwd[new_password][second]' => 'mypassword', - ]; - - $client->submit($form, $data); - - $this->assertSame(302, $client->getResponse()->getStatusCode()); - $this->assertStringContainsString('flashes.config.notice.password_not_updated_demo', $client->getContainer()->get(SessionInterface::class)->getFlashBag()->get('notice')[0]); - - $config->set('demo_mode_enabled', 0); - $config->set('demo_mode_username', 'wallabag'); - } - public function testDeleteUserButtonVisibility() { $this->logInAs('admin'); diff --git a/translations/CraueConfigBundle.cs.yml b/translations/CraueConfigBundle.cs.yml index 2ca932278..503046bfe 100644 --- a/translations/CraueConfigBundle.cs.yml +++ b/translations/CraueConfigBundle.cs.yml @@ -22,8 +22,6 @@ api_user_registration: Zapnout registraci uživatelů prostřednictvím API restricted_access: Povolit ověřování pro placené webové stránky download_images_enabled: Stahovat obrázky místně share_public: Povolit veřejné adresy URL pro položky -demo_mode_username: Ukázkový uživatel -demo_mode_enabled: Povolit ukázkový režim (Používá se pouze pro veřejnou ukázku Wallabag) matomo_site_id: ID vaší webové stránky na Matomo matomo_host: Hostitel vaší webové stránky na Matomo (bez http:// nebo https://) modify_settings: použít diff --git a/translations/CraueConfigBundle.da.yml b/translations/CraueConfigBundle.da.yml index 3a1e65dc7..f73b5ee12 100644 --- a/translations/CraueConfigBundle.da.yml +++ b/translations/CraueConfigBundle.da.yml @@ -24,5 +24,3 @@ modify_settings: "Gem ændring" matomo_host: Hosting af din side hos Matomo (uden http:// eller https://) matomo_site_id: ID for din side hos Matomo matomo_enabled: Aktiver Matomo -demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)" -demo_mode_username: "Demobruger" diff --git a/translations/CraueConfigBundle.de.yml b/translations/CraueConfigBundle.de.yml index 7c744d9f3..33121da21 100644 --- a/translations/CraueConfigBundle.de.yml +++ b/translations/CraueConfigBundle.de.yml @@ -28,9 +28,6 @@ modify_settings: Übernehmen matomo_host: Host deiner Webseite in Matomo (ohne http:// oder https://) matomo_site_id: ID deiner Webseite in Matomo matomo_enabled: Matomo aktivieren -demo_mode_enabled: Demo-Modus aktivieren? (Wird nur für die öffentliche Wallabag-Demo - verwendet) -demo_mode_username: Test-Benutzer share_public: Öffentliche URLs für Einträge zulassen download_images_enabled: Bilder lokal herunterladen restricted_access: Authentifizierung für Webseiten mit Paywall aktivieren diff --git a/translations/CraueConfigBundle.el.yml b/translations/CraueConfigBundle.el.yml index 685ba7de7..464517bd4 100644 --- a/translations/CraueConfigBundle.el.yml +++ b/translations/CraueConfigBundle.el.yml @@ -4,8 +4,6 @@ api_user_registration: Ενεργοποίηση εγγραφής χρήστη μ restricted_access: Ενεργοποίηση επαλήθευσης για ιστοσελίδες με paywall download_images_enabled: Λήψη εικόνων τοπικά share_public: Να επιτρέπονται URL για τα άρθρα -demo_mode_username: Χρήστης demo -demo_mode_enabled: Ενεργοποίηση λειτουργίας demo; (Χρησιμοποιείται μόνο για το δημόσιο demo του wallabag) matomo_enabled: Ενεργοποίηση Matomo matomo_site_id: ID της ιστοσελίδας σας στο Matomo matomo_host: Διεύθυνση της ιστοσελίδας σας στο Matomo (χωρίς http:// ή https://) diff --git a/translations/CraueConfigBundle.en.yml b/translations/CraueConfigBundle.en.yml index 4ceabd761..e1a913389 100644 --- a/translations/CraueConfigBundle.en.yml +++ b/translations/CraueConfigBundle.en.yml @@ -27,8 +27,6 @@ modify_settings: apply matomo_host: Host of your website in Matomo (without http:// or https://) matomo_site_id: ID of your website in Matomo matomo_enabled: Enable Matomo -demo_mode_enabled: Enable demo mode? (Only used for the public wallabag demo) -demo_mode_username: Demo user share_public: Allow public URLs for entries download_images_enabled: Download images locally restricted_access: Enable authentication for paywalled websites diff --git a/translations/CraueConfigBundle.es.yml b/translations/CraueConfigBundle.es.yml index 3ec2220e1..36e1a29c8 100644 --- a/translations/CraueConfigBundle.es.yml +++ b/translations/CraueConfigBundle.es.yml @@ -27,8 +27,6 @@ modify_settings: "guardar" matomo_host: Host de tu website en Matomo (sin http:// o https://) matomo_site_id: ID de tu website en Matomo matomo_enabled: Activar Matomo -demo_mode_enabled: "Activar modo demo (sólo usado en la demo pública de wallabag)" -demo_mode_username: "Nombre de usuario demo" share_public: Permitir URLs públicas para los artículos download_images_enabled: Descargar imágenes localmente restricted_access: Activar autenticación para websites con paywall diff --git a/translations/CraueConfigBundle.fr.yml b/translations/CraueConfigBundle.fr.yml index 971b9137c..0625ed0c4 100644 --- a/translations/CraueConfigBundle.fr.yml +++ b/translations/CraueConfigBundle.fr.yml @@ -27,8 +27,6 @@ modify_settings: appliquer matomo_host: URL de votre site dans Matomo (sans http:// ou https://) matomo_site_id: ID de votre site dans Matomo matomo_enabled: Activer Matomo -demo_mode_enabled: Activer le mode démo ? (Utiliser uniquement pour la démo publique de wallabag) -demo_mode_username: Utilisateur de la démo share_public: Autoriser les URL publiques pour les articles download_images_enabled: Télécharger les images en local restricted_access: Activer l'authentification pour les sites avec paywall diff --git a/translations/CraueConfigBundle.gl.yml b/translations/CraueConfigBundle.gl.yml index aede3bf89..8652eb052 100644 --- a/translations/CraueConfigBundle.gl.yml +++ b/translations/CraueConfigBundle.gl.yml @@ -4,8 +4,6 @@ api_user_registration: Activar rexistro de usuarias a través da API restricted_access: Activar autenticación para sitios web con acceso de pagamento download_images_enabled: Descargar imaxes localmente share_public: Permitir URLs públicos para entradas -demo_mode_username: Usuaria Demo -demo_mode_enabled: Activar modo demostración? (Só se usa na demo pública de wallabag) matomo_enabled: Activar Matomo matomo_site_id: ID do teu sitio web en Matomo matomo_host: Servidor do teu sitio web en Matomo (sen http:// ou https://) diff --git a/translations/CraueConfigBundle.hr.yml b/translations/CraueConfigBundle.hr.yml index 4e18c0b6a..19c9e6274 100644 --- a/translations/CraueConfigBundle.hr.yml +++ b/translations/CraueConfigBundle.hr.yml @@ -19,7 +19,6 @@ matomo_enabled: Aktiviraj Matomo import_with_redis: Aktiviraj Redis za asinkroni uvoz podataka restricted_access: Aktiviraj autentifikaciju za naplatne web-stranice export_mobi: Aktiviraj .mobi izvoz (zastarjelo, uskoro će se ukloniti) -demo_mode_enabled: Aktivirati demo modus? (Koristi se samo za javnu wallabag demonstraciju) diaspora_url: diaspora* URL, ako je usluga aktivirana import_with_rabbitmq: Aktiviraj RabbitMQ za asinkroni uvoz podataka api_user_registration: Aktiviraj korisničku registraciju putem sučelja @@ -34,6 +33,5 @@ misc: razno wallabag_support_url: URL podrške za wallabag export_xml: Aktiviraj XML izvoz show_printlink: Za ispis sadržaja, prikaži poveznicu -demo_mode_username: Demo korisnik import: uvezi share_public: Dozvoli javne URL-ove za zapise diff --git a/translations/CraueConfigBundle.hu.yml b/translations/CraueConfigBundle.hu.yml index 9176c0a0a..b99434380 100644 --- a/translations/CraueConfigBundle.hu.yml +++ b/translations/CraueConfigBundle.hu.yml @@ -27,9 +27,6 @@ modify_settings: alkalmaz piwik_host: Weboldalának hosztja a Piwik-en (http:// vagy https:// nélkül) piwik_site_id: Weboldalának azonosítója (ID-je) a Piwik-en piwik_enabled: Piwik engedélyezése -demo_mode_enabled: Engedélyezi a bemutató (demó) módot? (Csak a nyilvános wallabag - demóhoz használva) -demo_mode_username: Demó felhasználó share_public: Nyilvános URL-ek engedélyezése a bejegyzésekhez download_images_enabled: Képek letöltése helyileg restricted_access: Hitelesítés engedélyezése paywalled weboldalakhoz diff --git a/translations/CraueConfigBundle.id.yml b/translations/CraueConfigBundle.id.yml index 21f6af160..36c3de58f 100644 --- a/translations/CraueConfigBundle.id.yml +++ b/translations/CraueConfigBundle.id.yml @@ -11,11 +11,9 @@ shaarli_share_origin_url: Aktifkan berbagi URL asal ke Shaarli, jika layanan dia share_public: Izinkan URL publik untuk entri restricted_access: Aktifkan otentikasi untuk situs web berbayar share_twitter: Aktifkan berbagi ke Twitter -demo_mode_enabled: Aktifkan mode demo? (Hanya digunakan untuk demo wallabag publik) download_images_enabled: Unduh gambar secara lokal store_article_headers: Aktifkan jika wallabag menyimpan header HTTP untuk setiap artikel api_user_registration: Aktifkan pendaftaran pengguna melalui API -demo_mode_username: Pengguna demo download_pictures: Unduh gambar ke server Anda export_xml: Aktifkan ekspor XML import_with_rabbitmq: Aktifkan RabbitMQ untuk mengimpor data secara asinkron diff --git a/translations/CraueConfigBundle.it.yml b/translations/CraueConfigBundle.it.yml index d70344b94..c8017ca3c 100644 --- a/translations/CraueConfigBundle.it.yml +++ b/translations/CraueConfigBundle.it.yml @@ -24,7 +24,5 @@ modify_settings: "applica" matomo_host: Host del tuo sito in Matomo (senza http:// o https://) matomo_site_id: ID del tuo sito in Matomo matomo_enabled: Abilita Matomo -demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)" -demo_mode_username: "Utente Demo" api_user_registration: Abilita la registrazione dell'utente attraverso l'API settings_changed: Configurazione aggiornata diff --git a/translations/CraueConfigBundle.ja.yml b/translations/CraueConfigBundle.ja.yml index 74dd9737c..987360c69 100644 --- a/translations/CraueConfigBundle.ja.yml +++ b/translations/CraueConfigBundle.ja.yml @@ -27,8 +27,6 @@ modify_settings: 適用 matomo_host: Matomo のウェブサイトのホスト (http:// および https:// なし) matomo_site_id: Matomo でのあなたのウェブサイトの ID matomo_enabled: Matomo を有効にする -demo_mode_enabled: デモモードを有効にしますか? (公開 wallabag デモでのみ使用) -demo_mode_username: デモユーザー share_public: エントリの公開 URL を許可する download_images_enabled: 画像をローカルにダウンロード restricted_access: ペイウォールのあるウェブサイトへの認証を有効にする diff --git a/translations/CraueConfigBundle.ko.yml b/translations/CraueConfigBundle.ko.yml index 2af7174aa..0f00095c5 100644 --- a/translations/CraueConfigBundle.ko.yml +++ b/translations/CraueConfigBundle.ko.yml @@ -5,8 +5,6 @@ api_user_registration: API를 통해 사용자 등록 활성화 restricted_access: 유료 웹 사이트에 대한 인증 활성화 download_images_enabled: 이미지를 로컬로 다운로드 share_public: 항목의 공개 URL 허용 -demo_mode_username: 데모 사용자 -demo_mode_enabled: 데모 모드를 사용 하시겠습니까? (공개 Wallabag 데모에만 사용됨) matomo_enabled: Matomo 활성화 matomo_site_id: Matomo 웹 사이트 ID matomo_host: Matomo 웹 사이트의 호스트 (http:// 또는 https:// 없음) diff --git a/translations/CraueConfigBundle.nb.yml b/translations/CraueConfigBundle.nb.yml index 9c6a644d3..e0c244b09 100644 --- a/translations/CraueConfigBundle.nb.yml +++ b/translations/CraueConfigBundle.nb.yml @@ -26,8 +26,6 @@ modify_settings: bruk piwik_host: Vertskap for din nettside hos Piwik (uten http:// eller https://) piwik_site_id: ID for din nettside hos Piwik piwik_enabled: Skru på Piwik -demo_mode_enabled: Skru på demo-modus? (Kun brukt for offentlig wallabag-demo) -demo_mode_username: Demo-bruker share_public: Tillat offentlige nettadresser for oppføringer download_images_enabled: Last ned bilder lokalt restricted_access: Skru på identitetsbekreftelse for nettsider med betalingsmur diff --git a/translations/CraueConfigBundle.nl.yml b/translations/CraueConfigBundle.nl.yml index ada10e7df..6ee28ecbb 100644 --- a/translations/CraueConfigBundle.nl.yml +++ b/translations/CraueConfigBundle.nl.yml @@ -3,8 +3,6 @@ store_article_headers: Schakel het opslaan van HTTP headers voor ieder artikel i api_user_registration: Schakel gebruikersregistratie via API in restricted_access: Schakel authenticatie voor betaalde websites in download_images_enabled: Download afbeelding lokaal -demo_mode_username: Demo gebruiker -demo_mode_enabled: Schakel demo modus in? (Gebruik dit alleen voor de publieke wallabag demo) matomo_enabled: Schakel Matomo in matomo_site_id: ID van uw Matomo website matomo_host: Adres van uw Matomo website (zonder http:// of https://) diff --git a/translations/CraueConfigBundle.oc.yml b/translations/CraueConfigBundle.oc.yml index e8208f539..dbbadf586 100644 --- a/translations/CraueConfigBundle.oc.yml +++ b/translations/CraueConfigBundle.oc.yml @@ -28,8 +28,6 @@ modify_settings: "aplicar" matomo_host: URL de vòstre site dins Matomo (sense http:// o https://) matomo_site_id: ID de vòstre site dins Matomo matomo_enabled: Activar Matomo -demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)" -demo_mode_username: "Utilizaire de la demostracion" share_public: Autorizar una URL publica pels articles download_images_enabled: Telecargar los imatges en local restricted_access: Activar l'autenticacion pels sites amb peatge diff --git a/translations/CraueConfigBundle.pl.yml b/translations/CraueConfigBundle.pl.yml index 7b649e2ec..bd38066c7 100644 --- a/translations/CraueConfigBundle.pl.yml +++ b/translations/CraueConfigBundle.pl.yml @@ -26,8 +26,6 @@ modify_settings: zatwierdź matomo_host: Host twojej strony Matomo (bez http:// lub https://) matomo_site_id: ID twojej strony Matomo matomo_enabled: Włacz Matomo -demo_mode_enabled: Włączyć tryb demonstracyjny? (Używany wyłącznie do publicznej demonstracji wallabag) -demo_mode_username: Użytkownik demonstracyjny share_public: Zezwalaj na publiczne adresy URL dla wpisów download_images_enabled: Pobierz obrazy lokalnie restricted_access: Włącz autoryzację dla stron za paywallem diff --git a/translations/CraueConfigBundle.pt.yml b/translations/CraueConfigBundle.pt.yml index a7d834ccb..e5b70c2c3 100644 --- a/translations/CraueConfigBundle.pt.yml +++ b/translations/CraueConfigBundle.pt.yml @@ -25,8 +25,6 @@ modify_settings: "aplicar" matomo_host: Host de seu website Matomo matomo_site_id: ID de seu website Matomo matomo_enabled: Habilitar Matomo -demo_mode_enabled: "Habilitar modo demo? (somente usado para o demo público do wallabag)" -demo_mode_username: "Utilizador demo" restricted_access: Habilitar autenticação para sites com paywall download_images_enabled: Baixar imagens localmente import_with_redis: Habilitar Redis para importar dados assincronamente diff --git a/translations/CraueConfigBundle.ru.yml b/translations/CraueConfigBundle.ru.yml index 294a36f5b..f0d01796d 100644 --- a/translations/CraueConfigBundle.ru.yml +++ b/translations/CraueConfigBundle.ru.yml @@ -28,8 +28,6 @@ modify_settings: "применить" matomo_host: "Ссылка на Ваш сайт на Matomo (с http:// или https://)" matomo_site_id: "ID Вашего сайта на Matomo" matomo_enabled: "Включить Matomo" -demo_mode_enabled: "Включить демо режим ? (только для публичной демонстрации wallabag)" -demo_mode_username: "Демо пользователь" share_public: "Разрешить публичные ссылки на записи" download_images_enabled: "Скачивать изображения локально" restricted_access: "Включить авторизацию на сайте с помощью paywall" diff --git a/translations/CraueConfigBundle.th.yml b/translations/CraueConfigBundle.th.yml index c957f3f41..2e9227b98 100644 --- a/translations/CraueConfigBundle.th.yml +++ b/translations/CraueConfigBundle.th.yml @@ -26,8 +26,6 @@ modify_settings: "ปรับใช้" matomo_host: โฮสบนเว็บไซต์ของคุณใน Matomo (ยกเว้น http:// หรือ https://) matomo_site_id: ไอดีบนเว็บไซต์ของคุณใน Matomo matomo_enabled: เปิดการใช้ Matomo -demo_mode_enabled: "เปิดการใช้งานโหมดเดโม ? (เฉพาะการใช้สำหรับเดโมสาธารณะของ wallabag)" -demo_mode_username: "ผู้ใช้ส่วนเดโม" share_public: ยอมรับ URL สาธารณะจากการเข้าถึงข้อมูล download_images_enabled: ดาวน์โหลดรูปภาพเฉพาะ restricted_access: เปิดใช้งานการรองรับบนเว็บไซต์กับ paywall diff --git a/translations/CraueConfigBundle.tr.yml b/translations/CraueConfigBundle.tr.yml index c4093a1ec..441e7c9bc 100644 --- a/translations/CraueConfigBundle.tr.yml +++ b/translations/CraueConfigBundle.tr.yml @@ -27,8 +27,6 @@ modify_settings: uygula matomo_host: Matomo'teki web sitenizin host adresi (başında http:// veya https:// olmadan) matomo_site_id: Matomo'teki web sitenizin ID'si matomo_enabled: Matomo'yu etkinleştir -demo_mode_enabled: Demo mod etkinleştirilsin mi (Yalnızca herkese açık wallabag demoları için kullanılır) -demo_mode_username: Demo kullanıcısı share_public: Makaleler için herkese açık URL'lere izin ver download_images_enabled: Resimleri lokale indir restricted_access: Ödeme ile erişim sağlanabilen siteler için kimlik doğrulamayı etkinleştir diff --git a/translations/CraueConfigBundle.uk.yml b/translations/CraueConfigBundle.uk.yml index 68d8bcd19..7d12cf104 100644 --- a/translations/CraueConfigBundle.uk.yml +++ b/translations/CraueConfigBundle.uk.yml @@ -27,8 +27,6 @@ modify_settings: застосувати matomo_host: Host вашого сайту в Matomo (без http:// чи https://) matomo_site_id: ID вашого сайту в Matomo matomo_enabled: Увімкнути Matomo -demo_mode_enabled: Увімкнути демо-режим? (Використовується тільки для публічних демонстрацій wallabag) -demo_mode_username: Демо-користувач share_public: Дозволити публічні посилання на статті download_images_enabled: Завантажувати картинки локально restricted_access: Увімкнути аутентифікацію для сайтів з платним контентом diff --git a/translations/CraueConfigBundle.zh.yml b/translations/CraueConfigBundle.zh.yml index b5e16519b..8820ab875 100644 --- a/translations/CraueConfigBundle.zh.yml +++ b/translations/CraueConfigBundle.zh.yml @@ -27,8 +27,6 @@ modify_settings: "应用" matomo_host: 你的网站在 Matomo 的主机名（不包括 http:// or https://） matomo_site_id: 你的网站在 Matomo 的 ID matomo_enabled: 启用 Matomo -demo_mode_enabled: "启用演示模式？(仅用于 wallabag 公开演示)" -demo_mode_username: "Demo 用户名" share_public: 允许为项目启用公开链接 download_images_enabled: 在本地缓存图片 restricted_access: 启用针对带有付费墙网站的认证 diff --git a/translations/messages.cs.yml b/translations/messages.cs.yml index b90a9c9ea..2f253e274 100644 --- a/translations/messages.cs.yml +++ b/translations/messages.cs.yml @@ -566,7 +566,6 @@ flashes: tagging_rules_deleted: Pravidlo štítkování bylo odstraněno tagging_rules_updated: Pravidla štítkování byla aktualizována user_updated: Informace byla aktualizována - password_not_updated_demo: V ukázkovém režimu nelze pro tohoto uživatele změnit heslo. config_saved: Konfigurace byla uložena. ignore_origin_instance_rule: notice: diff --git a/translations/messages.de.yml b/translations/messages.de.yml index 7feb26f68..8f43a5f6c 100644 --- a/translations/messages.de.yml +++ b/translations/messages.de.yml @@ -642,7 +642,6 @@ flashes: notice: config_saved: Konfiguration gespeichert. password_updated: Kennwort aktualisiert - password_not_updated_demo: Im Testmodus kannst du das Kennwort nicht ändern. user_updated: Information aktualisiert rss_updated: RSS-Informationen aktualisiert tagging_rules_updated: Tagging-Regeln aktualisiert diff --git a/translations/messages.el.yml b/translations/messages.el.yml index f42dcd5a4..258234955 100644 --- a/translations/messages.el.yml +++ b/translations/messages.el.yml @@ -141,7 +141,6 @@ flashes: tagging_rules_deleted: Ο κανόνας σήμανσης ετικετών διαγράφηκε tagging_rules_updated: Οι κανόνες σήμανσης ετικετών ενημερώθηκαν user_updated: Οι πληροφορίες ενημερώθηκαν - password_not_updated_demo: Στη λειτουργία demo, δεν μπορείτε να αλλάξετε τον κωδικό για αυτόν τον χρήστη. password_updated: Ο κωδικός ενημερώθηκε config_saved: Οι ρυθμίσεις αποθηκεύτηκαν. error: diff --git a/translations/messages.en.yml b/translations/messages.en.yml index 51aa509f6..7952da5a7 100644 --- a/translations/messages.en.yml +++ b/translations/messages.en.yml @@ -650,7 +650,6 @@ flashes: notice: config_saved: Config saved. password_updated: Password updated - password_not_updated_demo: In demonstration mode, you can't change password for this user. user_updated: Information updated tagging_rules_updated: Tagging rules updated tagging_rules_deleted: Tagging rule deleted diff --git a/translations/messages.es.yml b/translations/messages.es.yml index 0f15738ea..41fadb6d3 100644 --- a/translations/messages.es.yml +++ b/translations/messages.es.yml @@ -644,7 +644,6 @@ flashes: notice: config_saved: 'Configuración guardada.' password_updated: 'Contraseña actualizada' - password_not_updated_demo: "En el modo demo, no puedes cambiar la contraseña del usuario." user_updated: 'Información actualizada' feed_updated: 'Configuración RSS actualizada' tagging_rules_updated: 'Regla de etiquetado actualizada' diff --git a/translations/messages.fa.yml b/translations/messages.fa.yml index 1a806cdc8..f7db78ba8 100644 --- a/translations/messages.fa.yml +++ b/translations/messages.fa.yml @@ -321,7 +321,6 @@ flashes: notice: config_saved: پیکربندی ذخیره شد. password_updated: رمز به‌روز شد - password_not_updated_demo: در حالت نمایشی نمی‌توانید رمز کاربر را عوض کنید. user_updated: اطلاعات به‌روز شد rss_updated: اطلاعات آر-اس-اس به‌روز شد tagging_rules_updated: برچسب‌گذاری خودکار به‌روز شد diff --git a/translations/messages.fr.yml b/translations/messages.fr.yml index 65d2d0ee6..b57f361a9 100644 --- a/translations/messages.fr.yml +++ b/translations/messages.fr.yml @@ -633,7 +633,6 @@ flashes: notice: config_saved: "Les paramètres ont bien été mis à jour." password_updated: "Votre mot de passe a bien été mis à jour" - password_not_updated_demo: "En démo, vous ne pouvez pas changer le mot de passe de cet utilisateur." user_updated: "Vos informations personnelles ont bien été mises à jour" feed_updated: "La configuration des flux a bien été mise à jour" tagging_rules_updated: "Règles mises à jour" diff --git a/translations/messages.gl.yml b/translations/messages.gl.yml index c6de3b6c7..c33519ce2 100644 --- a/translations/messages.gl.yml +++ b/translations/messages.gl.yml @@ -644,7 +644,6 @@ flashes: tagging_rules_deleted: Regra de etiquetado eliminada tagging_rules_updated: Regras de etiquetado actualizadas user_updated: Información actualizada - password_not_updated_demo: No modo demostración non podes cambiar o contrasinal da usuaria. password_updated: Contrasinal actualizado config_saved: Gardouse o axuste. error: diff --git a/translations/messages.hr.yml b/translations/messages.hr.yml index fac4cd4e4..7d5aa362c 100644 --- a/translations/messages.hr.yml +++ b/translations/messages.hr.yml @@ -400,7 +400,6 @@ flashes: summary_with_queue: 'Sažetak uvoza: %queued% u redu čekanja.' config: notice: - password_not_updated_demo: U demonstracijskom modusu ne možeš promijeniti lozinku za ovog korisnika. tags_reset: Oznake resetirane password_updated: Lozinka aktualizirana config_saved: Konfiguracija spremljena. diff --git a/translations/messages.it.yml b/translations/messages.it.yml index 92fde38f8..c5d3ee810 100644 --- a/translations/messages.it.yml +++ b/translations/messages.it.yml @@ -542,7 +542,6 @@ flashes: notice: config_saved: Configurazione salvata. password_updated: Password aggiornata - password_not_updated_demo: In modalità demo, non puoi cambiare la password dell'utente. user_updated: Informazioni aggiornate rss_updated: Informazioni RSS aggiornate tagging_rules_updated: Regole di etichettatura aggiornate diff --git a/translations/messages.ja.yml b/translations/messages.ja.yml index 34834a206..0091e2346 100644 --- a/translations/messages.ja.yml +++ b/translations/messages.ja.yml @@ -611,7 +611,6 @@ flashes: notice: config_saved: 設定を保存しました。 password_updated: パスワードを更新しました - password_not_updated_demo: デモ モードでは、このユーザーのパスワードを変更できません。 user_updated: 情報を更新しました rss_updated: RSS 情報を更新しました tagging_rules_updated: タグ付けルールを更新しました diff --git a/translations/messages.ko.yml b/translations/messages.ko.yml index 387db9fa3..6882221bc 100644 --- a/translations/messages.ko.yml +++ b/translations/messages.ko.yml @@ -330,7 +330,6 @@ flashes: feed_updated: 피드 정보가 업데이트되었습니다 tagging_rules_deleted: 태그 지정 규칙이 삭제되었습니다 tagging_rules_updated: 태그 지정 규칙이 업데이트되었습니다 - password_not_updated_demo: 데모 모드에서는이 사용자의 암호를 변경할 수 없습니다. password_updated: 비밀번호가 업데이트 되었습니다 ignore_origin_instance_rule: notice: diff --git a/translations/messages.nb.yml b/translations/messages.nb.yml index cbc96cfa0..eaa2fa7a4 100644 --- a/translations/messages.nb.yml +++ b/translations/messages.nb.yml @@ -226,7 +226,6 @@ flashes: tagging_rules_deleted: Etikettmerkingsregel slettet tagging_rules_updated: Etikettmerkingsregler oppdatert user_updated: Informasjon oppdatert - password_not_updated_demo: I demonstrasjonsmodus kan du ikke endre passordet for denne brukeren. password_updated: Passord oppdatert config_saved: Oppsett lagret. annotations_reset: Anføringer tilbakestilt diff --git a/translations/messages.nl.yml b/translations/messages.nl.yml index 9e57327a3..1dabfd645 100644 --- a/translations/messages.nl.yml +++ b/translations/messages.nl.yml @@ -270,7 +270,6 @@ flashes: tagging_rules_deleted: Labeling regel verwijderd tagging_rules_updated: Labeling regels geüpdatet rss_updated: RSS informatie geüpdatet - password_not_updated_demo: In demonstratiemodus kan u geen wachtwoord wijzigen voor deze gebruiker. entries_reset: Items gereset tags_reset: Labels gereset annotations_reset: Annotaties gereset diff --git a/translations/messages.oc.yml b/translations/messages.oc.yml index 99fedb770..76097ef0e 100644 --- a/translations/messages.oc.yml +++ b/translations/messages.oc.yml @@ -650,7 +650,6 @@ flashes: notice: config_saved: Los paramètres son ben estats meses a jorn. password_updated: Vòstre senhal es ben estat mes a jorn - password_not_updated_demo: En demostracion, podètz pas cambiar lo senhal d'aqueste utilizaire. user_updated: Vòstres informacions personnelas son ben estadas mesas a jorn rss_updated: La configuracion dels fluxes RSS es ben estada mesa a jorn tagging_rules_updated: Règlas misa a jorn diff --git a/translations/messages.pl.yml b/translations/messages.pl.yml index eaba0b23d..0a987c9e0 100644 --- a/translations/messages.pl.yml +++ b/translations/messages.pl.yml @@ -651,7 +651,6 @@ flashes: notice: config_saved: Konfiguracja zapisana. password_updated: Hasło zaktualizowane - password_not_updated_demo: W trybie demonstracyjnym nie możesz zmienić hasła dla tego użytkownika. user_updated: Informacje zaktualizowane rss_updated: Informacje RSS zaktualizowane tagging_rules_updated: Reguły tagowania zaktualizowane diff --git a/translations/messages.pt.yml b/translations/messages.pt.yml index 0b2b228d1..faffb3eaa 100644 --- a/translations/messages.pt.yml +++ b/translations/messages.pt.yml @@ -459,7 +459,6 @@ flashes: notice: config_saved: 'Configiração salva.' password_updated: 'Palavra-passe atualizada' - password_not_updated_demo: 'Em modo de demonstração, não pode alterar a palavra-passe deste utilizador.' rss_updated: 'Informação de RSS atualizada' tagging_rules_updated: 'Regras de tags atualizadas' tagging_rules_deleted: 'Regra de tag apagada' diff --git a/translations/messages.ro.yml b/translations/messages.ro.yml index 807a4333e..eefd795fb 100644 --- a/translations/messages.ro.yml +++ b/translations/messages.ro.yml @@ -177,7 +177,6 @@ flashes: notice: config_saved: 'Configurație salvată.' password_updated: 'Parolă actualizată' - password_not_updated_demo: "" user_updated: 'Informație actualizată' feed_updated: 'Informație RSS actualizată' entry: diff --git a/translations/messages.ru.yml b/translations/messages.ru.yml index 1b7f348e4..bc5fb3b07 100644 --- a/translations/messages.ru.yml +++ b/translations/messages.ru.yml @@ -622,7 +622,6 @@ flashes: notice: config_saved: 'Настройки сохранены.' password_updated: 'Пароль обновлен' - password_not_updated_demo: "В режиме демонстрации нельзя изменять пароль для этого пользователя." user_updated: 'Информация обновлена' rss_updated: 'RSS информация обновлена' tagging_rules_updated: 'Правила тегировния обновлены' diff --git a/translations/messages.th.yml b/translations/messages.th.yml index 069bd3a77..5d0e59e3a 100644 --- a/translations/messages.th.yml +++ b/translations/messages.th.yml @@ -532,7 +532,6 @@ flashes: notice: config_saved: 'กำหนดการบันทึก' password_updated: 'อัปเดตรหัสผ่าน' - password_not_updated_demo: "" user_updated: 'อัปเดตข้อมูล' feed_updated: 'อัปเดตข้อมูล RSS' tagging_rules_updated: 'อัปเดตการแท็กข้อบังคับ' diff --git a/translations/messages.tr.yml b/translations/messages.tr.yml index c4fdf3b45..e4c24ee1d 100644 --- a/translations/messages.tr.yml +++ b/translations/messages.tr.yml @@ -571,7 +571,6 @@ flashes: notice: config_saved: Yapılandırma ayarları kaydedildi. password_updated: Şifre güncellendi - password_not_updated_demo: Tanıtım demo modunda bu kullanıcı için parolanızı değiştiremezsiniz. user_updated: Bilgiler güncellendi rss_updated: RSS bilgiler güncellendi tagging_rules_updated: Etiketleme kuralları güncellendi diff --git a/translations/messages.uk.yml b/translations/messages.uk.yml index e3525faa0..6c8ab870c 100644 --- a/translations/messages.uk.yml +++ b/translations/messages.uk.yml @@ -586,7 +586,6 @@ flashes: notice: config_saved: Конфігурацію збережено. password_updated: Пароль оновлено - password_not_updated_demo: У режимі демонстрації ви не можете змінити пароль цього користувача. user_updated: Інформацію оновлено feed_updated: Інформацію про RSS оновлено tagging_rules_updated: Правила тегування оновлено diff --git a/translations/messages.zh.yml b/translations/messages.zh.yml index 9e27b2987..1b18d0620 100644 --- a/translations/messages.zh.yml +++ b/translations/messages.zh.yml @@ -647,7 +647,6 @@ flashes: notice: config_saved: '配置已保存。' password_updated: '密码已更新' - password_not_updated_demo: "在演示模式下，你不能更改此用户的密码。" user_updated: '信息已更新' feed_updated: '订阅源信息已更新' tagging_rules_updated: '标签规则已更新'