Open platform to collect and prioritize feedback
Signin modal update. (#1275)
Matt Robertsa32c0915fba6
diff --git a/app/pkg/web/testdata/basic.html b/app/pkg/web/testdata/basic.htmlindex aae0b44a8..20c0f5574 100755--- a/app/pkg/web/testdata/basic.html+++ b/app/pkg/web/testdata/basic.html@@ -52,20 +52,26 @@<script type="text/javascript" nonce="CONTEXT_ID">;(function () {- const params = new URLSearchParams(window.location.search)- let theme = "light"- if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {- theme = params.get("theme")- localStorage.setItem("theme", theme)- params.delete("theme")- const newUrl = `${window.location.pathname}?${params.toString()}`- window.history.replaceState({}, "", newUrl)- } else {- theme = localStorage.getItem("theme") || "light"- }+ try {+ if (typeof window !== 'undefined' && window.localStorage) {+ const params = new URLSearchParams(window.location.search)+ let theme = "light"+ if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {+ theme = params.get("theme")+ localStorage.setItem("theme", theme)+ params.delete("theme")+ const newUrl = `${window.location.pathname}?${params.toString()}`+ window.history.replaceState({}, "", newUrl)+ } else {+ theme = localStorage.getItem("theme") || "light"+ }- if (theme == "light" || theme == "dark") {- document.body.setAttribute("data-theme", theme)+ if (theme == "light" || theme == "dark") {+ document.body.setAttribute("data-theme", theme)+ }+ }+ } catch (e) {+ document.body.setAttribute("data-theme", "light")}})()</script>diff --git a/app/pkg/web/testdata/canonical.html b/app/pkg/web/testdata/canonical.htmlindex 84b6fa920..a69f4b7b9 100755--- a/app/pkg/web/testdata/canonical.html+++ b/app/pkg/web/testdata/canonical.html@@ -54,20 +54,26 @@<script type="text/javascript" nonce="CONTEXT_ID">;(function () {- const params = new URLSearchParams(window.location.search)- let theme = "light"- if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {- theme = params.get("theme")- localStorage.setItem("theme", theme)- params.delete("theme")- const newUrl = `${window.location.pathname}?${params.toString()}`- window.history.replaceState({}, "", newUrl)- } else {- theme = localStorage.getItem("theme") || "light"- }+ try {+ if (typeof window !== 'undefined' && window.localStorage) {+ const params = new URLSearchParams(window.location.search)+ let theme = "light"+ if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {+ theme = params.get("theme")+ localStorage.setItem("theme", theme)+ params.delete("theme")+ const newUrl = `${window.location.pathname}?${params.toString()}`+ window.history.replaceState({}, "", newUrl)+ } else {+ theme = localStorage.getItem("theme") || "light"+ }- if (theme == "light" || theme == "dark") {- document.body.setAttribute("data-theme", theme)+ if (theme == "light" || theme == "dark") {+ document.body.setAttribute("data-theme", theme)+ }+ }+ } catch (e) {+ document.body.setAttribute("data-theme", "light")}})()</script>diff --git a/app/pkg/web/testdata/chunk.html b/app/pkg/web/testdata/chunk.htmlindex 0e98c649e..43603148e 100644--- a/app/pkg/web/testdata/chunk.html+++ b/app/pkg/web/testdata/chunk.html@@ -52,20 +52,26 @@<script type="text/javascript" nonce="CONTEXT_ID">;(function () {- const params = new URLSearchParams(window.location.search)- let theme = "light"- if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {- theme = params.get("theme")- localStorage.setItem("theme", theme)- params.delete("theme")- const newUrl = `${window.location.pathname}?${params.toString()}`- window.history.replaceState({}, "", newUrl)- } else {- theme = localStorage.getItem("theme") || "light"- }+ try {+ if (typeof window !== 'undefined' && window.localStorage) {+ const params = new URLSearchParams(window.location.search)+ let theme = "light"+ if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {+ theme = params.get("theme")+ localStorage.setItem("theme", theme)+ params.delete("theme")+ const newUrl = `${window.location.pathname}?${params.toString()}`+ window.history.replaceState({}, "", newUrl)+ } else {+ theme = localStorage.getItem("theme") || "light"+ }- if (theme == "light" || theme == "dark") {- document.body.setAttribute("data-theme", theme)+ if (theme == "light" || theme == "dark") {+ document.body.setAttribute("data-theme", theme)+ }+ }+ } catch (e) {+ document.body.setAttribute("data-theme", "light")}})()</script>diff --git a/app/pkg/web/testdata/home.html b/app/pkg/web/testdata/home.htmlindex 7938fd47b..7bebfe39d 100755--- a/app/pkg/web/testdata/home.html+++ b/app/pkg/web/testdata/home.html@@ -52,20 +52,26 @@<script type="text/javascript" nonce="CONTEXT_ID">;(function () {- const params = new URLSearchParams(window.location.search)- let theme = "light"- if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {- theme = params.get("theme")- localStorage.setItem("theme", theme)- params.delete("theme")- const newUrl = `${window.location.pathname}?${params.toString()}`- window.history.replaceState({}, "", newUrl)- } else {- theme = localStorage.getItem("theme") || "light"- }+ try {+ if (typeof window !== 'undefined' && window.localStorage) {+ const params = new URLSearchParams(window.location.search)+ let theme = "light"+ if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {+ theme = params.get("theme")+ localStorage.setItem("theme", theme)+ params.delete("theme")+ const newUrl = `${window.location.pathname}?${params.toString()}`+ window.history.replaceState({}, "", newUrl)+ } else {+ theme = localStorage.getItem("theme") || "light"+ }- if (theme == "light" || theme == "dark") {- document.body.setAttribute("data-theme", theme)+ if (theme == "light" || theme == "dark") {+ document.body.setAttribute("data-theme", theme)+ }+ }+ } catch (e) {+ document.body.setAttribute("data-theme", "light")}})()</script>diff --git a/app/pkg/web/testdata/home_ssr.html b/app/pkg/web/testdata/home_ssr.htmlindex cc6d11ed6..72749a104 100755--- a/app/pkg/web/testdata/home_ssr.html+++ b/app/pkg/web/testdata/home_ssr.html@@ -52,20 +52,26 @@<script type="text/javascript" nonce="CONTEXT_ID">;(function () {- const params = new URLSearchParams(window.location.search)- let theme = "light"- if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {- theme = params.get("theme")- localStorage.setItem("theme", theme)- params.delete("theme")- const newUrl = `${window.location.pathname}?${params.toString()}`- window.history.replaceState({}, "", newUrl)- } else {- theme = localStorage.getItem("theme") || "light"- }+ try {+ if (typeof window !== 'undefined' && window.localStorage) {+ const params = new URLSearchParams(window.location.search)+ let theme = "light"+ if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {+ theme = params.get("theme")+ localStorage.setItem("theme", theme)+ params.delete("theme")+ const newUrl = `${window.location.pathname}?${params.toString()}`+ window.history.replaceState({}, "", newUrl)+ } else {+ theme = localStorage.getItem("theme") || "light"+ }- if (theme == "light" || theme == "dark") {- document.body.setAttribute("data-theme", theme)+ if (theme == "light" || theme == "dark") {+ document.body.setAttribute("data-theme", theme)+ }+ }+ } catch (e) {+ document.body.setAttribute("data-theme", "light")}})()</script>diff --git a/app/pkg/web/testdata/oauth.html b/app/pkg/web/testdata/oauth.htmlindex cacce36ec..4c4c186ef 100755--- a/app/pkg/web/testdata/oauth.html+++ b/app/pkg/web/testdata/oauth.html@@ -52,20 +52,26 @@<script type="text/javascript" nonce="CONTEXT_ID">;(function () {- const params = new URLSearchParams(window.location.search)- let theme = "light"- if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {- theme = params.get("theme")- localStorage.setItem("theme", theme)- params.delete("theme")- const newUrl = `${window.location.pathname}?${params.toString()}`- window.history.replaceState({}, "", newUrl)- } else {- theme = localStorage.getItem("theme") || "light"- }+ try {+ if (typeof window !== 'undefined' && window.localStorage) {+ const params = new URLSearchParams(window.location.search)+ let theme = "light"+ if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {+ theme = params.get("theme")+ localStorage.setItem("theme", theme)+ params.delete("theme")+ const newUrl = `${window.location.pathname}?${params.toString()}`+ window.history.replaceState({}, "", newUrl)+ } else {+ theme = localStorage.getItem("theme") || "light"+ }- if (theme == "light" || theme == "dark") {- document.body.setAttribute("data-theme", theme)+ if (theme == "light" || theme == "dark") {+ document.body.setAttribute("data-theme", theme)+ }+ }+ } catch (e) {+ document.body.setAttribute("data-theme", "light")}})()</script>diff --git a/app/pkg/web/testdata/tenant.html b/app/pkg/web/testdata/tenant.htmlindex 804145184..c1dca07ee 100755--- a/app/pkg/web/testdata/tenant.html+++ b/app/pkg/web/testdata/tenant.html@@ -52,20 +52,26 @@<script type="text/javascript" nonce="CONTEXT_ID">;(function () {- const params = new URLSearchParams(window.location.search)- let theme = "light"- if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {- theme = params.get("theme")- localStorage.setItem("theme", theme)- params.delete("theme")- const newUrl = `${window.location.pathname}?${params.toString()}`- window.history.replaceState({}, "", newUrl)- } else {- theme = localStorage.getItem("theme") || "light"- }+ try {+ if (typeof window !== 'undefined' && window.localStorage) {+ const params = new URLSearchParams(window.location.search)+ let theme = "light"+ if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {+ theme = params.get("theme")+ localStorage.setItem("theme", theme)+ params.delete("theme")+ const newUrl = `${window.location.pathname}?${params.toString()}`+ window.history.replaceState({}, "", newUrl)+ } else {+ theme = localStorage.getItem("theme") || "light"+ }- if (theme == "light" || theme == "dark") {- document.body.setAttribute("data-theme", theme)+ if (theme == "light" || theme == "dark") {+ document.body.setAttribute("data-theme", theme)+ }+ }+ } catch (e) {+ document.body.setAttribute("data-theme", "light")}})()</script>diff --git a/app/pkg/web/testdata/user.html b/app/pkg/web/testdata/user.htmlindex f19f7ecd1..12c4a16cc 100755--- a/app/pkg/web/testdata/user.html+++ b/app/pkg/web/testdata/user.html@@ -52,20 +52,26 @@<script type="text/javascript" nonce="CONTEXT_ID">;(function () {- const params = new URLSearchParams(window.location.search)- let theme = "light"- if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {- theme = params.get("theme")- localStorage.setItem("theme", theme)- params.delete("theme")- const newUrl = `${window.location.pathname}?${params.toString()}`- window.history.replaceState({}, "", newUrl)- } else {- theme = localStorage.getItem("theme") || "light"- }+ try {+ if (typeof window !== 'undefined' && window.localStorage) {+ const params = new URLSearchParams(window.location.search)+ let theme = "light"+ if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {+ theme = params.get("theme")+ localStorage.setItem("theme", theme)+ params.delete("theme")+ const newUrl = `${window.location.pathname}?${params.toString()}`+ window.history.replaceState({}, "", newUrl)+ } else {+ theme = localStorage.getItem("theme") || "light"+ }- if (theme == "light" || theme == "dark") {- document.body.setAttribute("data-theme", theme)+ if (theme == "light" || theme == "dark") {+ document.body.setAttribute("data-theme", theme)+ }+ }+ } catch (e) {+ document.body.setAttribute("data-theme", "light")}})()</script>diff --git a/locale/ar/client.json b/locale/ar/client.jsonindex 487abba0e..2f9c80469 100644--- a/locale/ar/client.json+++ b/locale/ar/client.json@@ -81,8 +81,8 @@"label.unsubscribe": "إلغاء الاشتراك","label.voters": "المصوتون","labels.notagsavailable": "لا توجد وسوم متاحة",- "legal.agreement": "لقد قرأت <0/> و <1/>، وأوافق على ذلك.",- "legal.notice": "بتسجيل الدخول، فإنك توافق على <0/> و <1/>.",+ "legal.agreement": "I have read and agree to the <0/> and <1/>.",+ "legal.notice": "من خلال تسجيل الدخول، أنت توافق على <2/><0/> و <1/>.","legal.privacypolicy": "سياسة الخصوصية","legal.termsofservice": "شروط الخدمة","menu.administration": "آلإدارة",@@ -103,7 +103,7 @@"modal.notifications.unread": "إشعارات غير مقروءة","modal.showvotes.message.zeromatches": "لم يتم العثور على مستخدمين مطابقين ل <0>{0}</0>.","modal.showvotes.query.placeholder": "البحث عن المستخدمين بالاسم...",- "modal.signin.header": "قم بتسجيل الدخول للمشاركة والتصويت",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "تمت قراءتها خلال آخر 30 يومًا.","mynotifications.message.nounread": "لا توجد إشعارات غير مقروءة.","mynotifications.page.subtitle": "ابقَ على اطلاع بما يحدث",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "ما الذي يجري مع هذا المنشور؟ أخبر المستخدمين ما هي خططك...","showpost.votespanel.more": "+{extraVotesCount} أكثر","showpost.votespanel.seedetails": "عرض التفاصيل",- "signin.message.email": "أدخل عنوان بريدك الإلكتروني لتسجيل الدخول",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "تم تعطيل مصادقة البريد الإلكتروني من قبل المسؤول. إذا كان لديك حساب مسؤول وتحتاج إلى تجاوز هذا التقييد، الرجاء <0>انقر هنا </0>.","signin.message.emailsent": "لقد أرسلنا للتو رابط تأكيد إلى <0>{email}</0>. انقر فوق الرابط وسوف تسجل دخولك.","signin.message.locked.text": "لإعادة تنشيط هذا الموقع، قم بتسجيل الدخول باستخدام حساب مسؤول وتحديث الإعدادات المطلوبة.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "يسمح حاليا فقط بتسجيل الدخول إلى حساب مسؤول","signin.message.private.text": "إذا كان لديك حساب أو دعوت، فيمكنك استخدام الخيارات التالية لتسجيل الدخول.","signin.message.private.title": "<0>{0}</0> مساحة خاصة، يجب عليك تسجيل الدخول للمشاركة والتصويت.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, zero {}one {# وسم} two {# وسوم} few {# وسوم} many {# وسوم} other {# وسوم}}"}diff --git a/locale/cs/client.json b/locale/cs/client.jsonindex af1ad3293..083d8c65b 100644--- a/locale/cs/client.json+++ b/locale/cs/client.json@@ -81,8 +81,8 @@"label.unsubscribe": "Unsubscribe","label.voters": "Voters","labels.notagsavailable": "No tags available",- "legal.agreement": "I have read and agree to the <0/> and <1/>.",- "legal.notice": "By signing in, you agree to the <0/> and <1/>.",+ "legal.agreement": "Přečetl jsem si a souhlasím s <0/> a <1/>.",+ "legal.notice": "Přihlášením souhlasíte s <2/><0/> a <1/>.","legal.privacypolicy": "Privacy Policy","legal.termsofservice": "Terms of Service","menu.administration": "Administration",@@ -103,7 +103,7 @@"modal.notifications.unread": "Unread notifications","modal.showvotes.message.zeromatches": "No users found matching <0>{0}</0>.","modal.showvotes.query.placeholder": "Search for users by name...",- "modal.signin.header": "Sign in to participate and vote",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Read on last 30 days.","mynotifications.message.nounread": "No unread notifications.","mynotifications.page.subtitle": "Stay up to date with what's happening",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "What's going on with this post? Let your users know what are your plans...","showpost.votespanel.more": "+{extraVotesCount} more","showpost.votespanel.seedetails": "see details",- "signin.message.email": "Enter your email address to sign in",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "Email authentication has been disabled by an administrator. If you have an administrator account and need to bypass this restriction, please <0>click here</0>.","signin.message.emailsent": "We have just sent a confirmation link to <0>{email}</0>. Click the link and you’ll be signed in.","signin.message.locked.text": "To reactivate this site, sign in with an administrator account and update the required settings.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Currently only allowed to sign in to an administrator account","signin.message.private.text": "If you have an account or an invitation, you may use following options to sign in.","signin.message.private.title": "<0>{0}</0> is a private space, you must sign in to participate and vote.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}diff --git a/locale/de/client.json b/locale/de/client.jsonindex 9d5c64c6c..dffcb03bc 100644--- a/locale/de/client.json+++ b/locale/de/client.json@@ -81,8 +81,8 @@"label.unsubscribe": "Abbestellen","label.voters": "Wähler","labels.notagsavailable": "No tags available",- "legal.agreement": "Ich habe die <0/> und <1/> gelesen und akzeptiere sie.",- "legal.notice": "Wenn Du dich registrierst, stimmst Du unseren <0/> und <1/> zu.",+ "legal.agreement": "I have read and agree to the <0/> and <1/>.",+ "legal.notice": "Door in te loggen, ga je akkoord met de <2/><0/> en <1/>.","legal.privacypolicy": "Datenschutzerklärung","legal.termsofservice": "Nutzungsbedingungen","menu.administration": "Administration",@@ -103,7 +103,7 @@"modal.notifications.unread": "Ungelesene Benachrichtigungen","modal.showvotes.message.zeromatches": "Keine Benutzer gefunden, die <0>{0}</0> entsprechen.","modal.showvotes.query.placeholder": "Suche nach Benutzern nach Namen...",- "modal.signin.header": "Melde dich an, um teilzunehmen und abzustimmen",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Lies, was in den letzten 30 Tagen geschrieben wurde.","mynotifications.message.nounread": "Keine ungelesenen Benachrichtigungen.","mynotifications.page.subtitle": "Bleibe immer auf dem Laufenden",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "Was passiert in diesem Beitrag? Lass deine Benutzer wissen, was deine Pläne sind...","showpost.votespanel.more": "+{extraVotesCount} mehr","showpost.votespanel.seedetails": "Details anschauen",- "signin.message.email": "Gebe deine E-Mail-Adresse ein, um dich anzumelden",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "Die E-Mail-Authentifizierung wurde von einem Administrator deaktiviert. Wenn du ein Administrator-Konto hast und diese Einschränkung umgehen musst, klicke bitte <0>hier</0>.","signin.message.emailsent": "Wir haben soeben einen Bestätigungslink an <0>{email}</0> gesendet. Klicke auf den Link und du wirst angemeldet.","signin.message.locked.text": "Um diese Seite wieder zu aktivieren, melde dich mit einem Administrator-Konto an und aktualisiere die erforderlichen Einstellungen.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Derzeit ist die Anmeldung nur mit einem Administratorkonto erlaubt.","signin.message.private.text": "Wenn du ein Konto oder eine Einladung hast, kannst du folgende Optionen nutzen, um dich anzumelden.","signin.message.private.title": "<0>{0}</0> ist ein privater Raum, du musst dich anmelden, um teilzunehmen und abstimmen zu können.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# Tag} other {# Tags}}"}diff --git a/locale/el/client.json b/locale/el/client.jsonindex 32fd348c5..e58d865bd 100644--- a/locale/el/client.json+++ b/locale/el/client.json@@ -82,7 +82,7 @@"label.voters": "Ψηφοφόροι","labels.notagsavailable": "No tags available","legal.agreement": "Έχω διαβάσει και συμφωνώ με το <0/> και <1/>.",- "legal.notice": "Με την είσοδο, συμφωνείτε με το <0/> και <1/>.",+ "legal.notice": "Με την είσοδο, συμφωνείτε με το <2/><0/> και <1/>.","legal.privacypolicy": "Πολιτική Απορρήτου","legal.termsofservice": "Όροι χρήσης","menu.administration": "Διαχείριση",@@ -103,7 +103,7 @@"modal.notifications.unread": "Unread notifications","modal.showvotes.message.zeromatches": "Δεν βρέθηκαν χρήστες που να ταιριάζουν <0>{0}</0>.","modal.showvotes.query.placeholder": "Αναζήτηση χρηστών με όνομα...",- "modal.signin.header": "Συνδεθείτε για να συμμετάσχετε και να ψηφίσετε",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Διαβάστε τις τελευταίες 30 ημέρες.","mynotifications.message.nounread": "Καμία μη αναγνωσμένη ειδοποίηση.","mynotifications.page.subtitle": "Μείνετε ενημερωμένοι με το τι συμβαίνει",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "Τι συμβαίνει με αυτή την ανάρτηση; Αφήστε τους χρήστες σας να γνωρίζουν ποια είναι τα σχέδιά σας...","showpost.votespanel.more": "+{extraVotesCount} περισσότερα","showpost.votespanel.seedetails": "δείτε λεπτομέρειες",- "signin.message.email": "Εισάγετε τη διεύθυνση email σας για να συνδεθείτε",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "Ο έλεγχος ταυτότητας email έχει απενεργοποιηθεί από τον διαχειριστή. Εάν έχετε λογαριασμό διαχειριστή και πρέπει να παρακάμψετε αυτόν τον περιορισμό, παρακαλώ <0>κάντε κλικ εδώ</0>.","signin.message.emailsent": "Μόλις στείλαμε έναν σύνδεσμο επιβεβαίωσης στο <0>{email}</0>. Κάντε κλικ στο σύνδεσμο και θα συνδεθείτε.","signin.message.locked.text": "Για να επανενεργοποιήσετε αυτόν τον ιστότοπο, συνδεθείτε με έναν λογαριασμό διαχειριστή και να ενημερώσετε τις απαιτούμενες ρυθμίσεις.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Αυτήν τη στιγμή επιτρέπεται μόνο να συνδεθείτε σε λογαριασμό διαχειριστή","signin.message.private.text": "Αν έχετε λογαριασμό ή πρόσκληση, μπορείτε να χρησιμοποιήσετε τις παρακάτω επιλογές για να συνδεθείτε.","signin.message.private.title": "<0>{0}</0> είναι ένας ιδιωτικός χώρος, πρέπει να συνδεθείτε για να συμμετάσχετε και να ψηφίσετε.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# ετικέτα} other {# ετικέτες}}"}diff --git a/locale/en/client.json b/locale/en/client.jsonindex af1ad3293..5c4c291fc 100644--- a/locale/en/client.json+++ b/locale/en/client.json@@ -82,7 +82,7 @@"label.voters": "Voters","labels.notagsavailable": "No tags available","legal.agreement": "I have read and agree to the <0/> and <1/>.",- "legal.notice": "By signing in, you agree to the <0/> and <1/>.",+ "legal.notice": "By signing in, you agree to the <2/><0/> and <1/>.","legal.privacypolicy": "Privacy Policy","legal.termsofservice": "Terms of Service","menu.administration": "Administration",@@ -103,7 +103,7 @@"modal.notifications.unread": "Unread notifications","modal.showvotes.message.zeromatches": "No users found matching <0>{0}</0>.","modal.showvotes.query.placeholder": "Search for users by name...",- "modal.signin.header": "Sign in to participate and vote",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Read on last 30 days.","mynotifications.message.nounread": "No unread notifications.","mynotifications.page.subtitle": "Stay up to date with what's happening",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "What's going on with this post? Let your users know what are your plans...","showpost.votespanel.more": "+{extraVotesCount} more","showpost.votespanel.seedetails": "see details",- "signin.message.email": "Enter your email address to sign in",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "Email authentication has been disabled by an administrator. If you have an administrator account and need to bypass this restriction, please <0>click here</0>.","signin.message.emailsent": "We have just sent a confirmation link to <0>{email}</0>. Click the link and you’ll be signed in.","signin.message.locked.text": "To reactivate this site, sign in with an administrator account and update the required settings.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Currently only allowed to sign in to an administrator account","signin.message.private.text": "If you have an account or an invitation, you may use following options to sign in.","signin.message.private.title": "<0>{0}</0> is a private space, you must sign in to participate and vote.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}diff --git a/locale/es-ES/client.json b/locale/es-ES/client.jsonindex 85d8ab77f..a577683c6 100644--- a/locale/es-ES/client.json+++ b/locale/es-ES/client.json@@ -82,7 +82,7 @@"label.voters": "Votantes","labels.notagsavailable": "No tags available","legal.agreement": "He leído y acepto los <0/> y <1/>.",- "legal.notice": "Al iniciar sesión, aceptas los <0/> y <1/>.",+ "legal.notice": "Al iniciar sesión, aceptas los <2/><0/> y <1/>.","legal.privacypolicy": "Política de Privacidad","legal.termsofservice": "Términos del servicio","menu.administration": "Administración",@@ -103,7 +103,7 @@"modal.notifications.unread": "Unread notifications","modal.showvotes.message.zeromatches": "No se encontraron usuarios que coincidan con <0>{0}</0>.","modal.showvotes.query.placeholder": "Buscar usuarios por nombre...",- "modal.signin.header": "Inicia sesión para publicar y votar",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Leer los últimos 30 días.","mynotifications.message.nounread": "No hay notificaciones no leídas.","mynotifications.page.subtitle": "Mantente informado de lo que está sucediendo",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "¿Qué está pasando con esta publicación? Dile a tus usuarios cuáles son tus planes...","showpost.votespanel.more": "+{extraVotesCount} más","showpost.votespanel.seedetails": "ver detalles",- "signin.message.email": "Introduce tu dirección de correo electrónico para iniciar sesión",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "La autenticación de correo electrónico ha sido deshabilitada por un administrador. Si tiene una cuenta de administrador y necesita eludir esta restricción, por favor <0>haga clic aquí</0>.","signin.message.emailsent": "Acabamos de enviar un enlace de confirmación a <0>{email}</0>. Haz clic en el enlace para iniciar session.","signin.message.locked.text": "Para reactivar este sitio, inicie sesión con una cuenta de administrador y actualice la configuración requerida.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Actualmente sólo se permite iniciar sesión en una cuenta de administrador","signin.message.private.text": "Si tienes una cuenta o una invitación, puedes usar las siguientes opciones para iniciar sesión.","signin.message.private.title": "<0>{0}</0> es un espacio privado, debes iniciar sesión para participar y votar.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# etiqueta} other {# etiquetas}}"}diff --git a/locale/fr/client.json b/locale/fr/client.jsonindex d2c00772d..27ebbf135 100644--- a/locale/fr/client.json+++ b/locale/fr/client.json@@ -15,8 +15,8 @@"action.vote": "Voter pour cette idée","action.voted": "Votée !","d41FkJ": "{count, plural, one {# étiquette} other {# étiquettes}}",- "editor.markdownmode": "Switch to markdown editor",- "editor.richtextmode": "Switch to rich text editor",+ "editor.markdownmode": "Basculer vers l'éditeur markdown",+ "editor.richtextmode": "Basculer vers l'éditeur de texte enrichi","enum.poststatus.completed": "Terminé","enum.poststatus.declined": "Refusé","enum.poststatus.deleted": "Supprimé",@@ -70,19 +70,19 @@"label.moderation": "Modération","label.name": "Nom","label.none": "Aucun",- "label.notagsavailable": "No tags available",+ "label.notagsavailable": "Aucune étiquette disponible","label.notifications": "Notifications","label.or": "OU",- "label.selecttags": "Select tags...",+ "label.selecttags": "Séléctionner des étiquettes...","label.subscribe": "S'abonner","label.tags": "Tags","label.unfollow": "Ne plus suivre","label.unread": "Non lu","label.unsubscribe": "Se désabonner","label.voters": "Votants",- "labels.notagsavailable": "No tags available",+ "labels.notagsavailable": "Aucune étiquette disponible","legal.agreement": "J'ai lu et j'accepte les <0/> et <1/>.",- "legal.notice": "En vous connectant, vous acceptez les <0/> et <1/>.",+ "legal.notice": "En vous connectant, vous acceptez les <2/><0/> et <1/>.","legal.privacypolicy": "Politique de confidentialité","legal.termsofservice": "Conditions générales d’utilisation","menu.administration": "Administration",@@ -103,7 +103,7 @@"modal.notifications.unread": "Notifications non lues","modal.showvotes.message.zeromatches": "Aucun utilisateur correspondant à <0>{0}</0>.","modal.showvotes.query.placeholder": "Rechercher des utilisateurs par nom...",- "modal.signin.header": "Inscrivez-vous pour participer et voter",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Lu sur les 30 dernier jours.","mynotifications.message.nounread": "Pas de notification non lue.","mynotifications.page.subtitle": "Restez au courant de ce qui se passe",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "Que se passe-t-il avec ce message ? Faites savoir à vos utilisateurs quels sont vos plans...","showpost.votespanel.more": "+{extraVotesCount} de plus","showpost.votespanel.seedetails": "voir les détails",- "signin.message.email": "Entrez votre adresse e-mail pour vous connecter",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "L'authentification par e-mail a été désactivée par un administrateur. Si vous avez un compte administrateur, <0>cliquez ici</0> pour vous connecter.","signin.message.emailsent": "Nous venons d'envoyer un lien de confirmation à <0>{email}</0>. Cliquez sur le lien et vous serez connecté.","signin.message.locked.text": "Pour réactiver ce site, connectez-vous avec un compte administrateur et mettez à jour les paramètres requis.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Seuls les comptes administrateurs peuvent se connecter en ce moment","signin.message.private.text": "Si vous avez un compte ou une invitation, vous pouvez utiliser les options suivantes pour vous connecter.","signin.message.private.title": "<0>{0}</0> est un espace privé, vous devez vous connecter pour participer et voter.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}diff --git a/locale/it/client.json b/locale/it/client.jsonindex a59918088..874d488b3 100644--- a/locale/it/client.json+++ b/locale/it/client.json@@ -82,7 +82,7 @@"label.voters": "Votanti","labels.notagsavailable": "No tags available","legal.agreement": "Ho letto e accetto le <0/> e <1/>.",- "legal.notice": "Accedendo, accetti i <0/> e <1/>.",+ "legal.notice": "Accedendo, accetti i <2/><0/> e <1/>.","legal.privacypolicy": "Informativa sulla privacy","legal.termsofservice": "Termini di servizio","menu.administration": "Amministrazione",@@ -103,7 +103,7 @@"modal.notifications.unread": "Unread notifications","modal.showvotes.message.zeromatches": "Nessun utente trovato corrispondente a <0>{0}</0>.","modal.showvotes.query.placeholder": "Cerca gli utenti per nome...",- "modal.signin.header": "Accedi per partecipare e votare",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Continua a leggere negli ultimi 30 giorni.","mynotifications.message.nounread": "Nessuna nuova notifica.","mynotifications.page.subtitle": "Rimani aggiornato su quello che sta succedendo",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "Cosa succede con questo post? Fate sapere ai vostri utenti quali sono i vostri piani...","showpost.votespanel.more": "+{extraVotesCount} di più","showpost.votespanel.seedetails": "vedi dettagli",- "signin.message.email": "Inserisci il tuo indirizzo email per accedere",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "L'autenticazione email è stata disabilitata da un amministratore. Se hai un account amministratore e hai bisogno di bypassare questa restrizione, per favore <0>clicca qui</0>.","signin.message.emailsent": "Abbiamo appena inviato un link di conferma a <0>{email}</0>. Clicca sul link e ti verrà effettuato l'accesso.","signin.message.locked.text": "Per riattivare questo sito, accedi con un account amministratore e aggiorna le impostazioni richieste.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Al momento è consentito accedere solo agli account amministratore","signin.message.private.text": "Se si dispone di un account o di un invito, è possibile utilizzare le seguenti opzioni per accedere.","signin.message.private.title": "<0>{0}</0> è uno spazio privato, è necessario registrarsi per partecipare e votare.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}diff --git a/locale/ja/client.json b/locale/ja/client.jsonindex 5cdfc6f8c..ba15578dc 100644--- a/locale/ja/client.json+++ b/locale/ja/client.json@@ -82,7 +82,7 @@"label.voters": "投票者","labels.notagsavailable": "No tags available","legal.agreement": "私は<0/>と<1/>を読み、同意しました。",- "legal.notice": "サインインすることにより、<0/>と<1/>に同意します。",+ "legal.notice": "By signing in, you agree to the <2/><0/> and <1/>.","legal.privacypolicy": "プライバシーポリシー","legal.termsofservice": "サービス利用規約","menu.administration": "管理",@@ -103,7 +103,7 @@"modal.notifications.unread": "未読通知","modal.showvotes.message.zeromatches": "<0>{0}</0>に一致するユーザーは見つかりませんでした。","modal.showvotes.query.placeholder": "名前でユーザーを検索...",- "modal.signin.header": "サインインして参加・投票",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "過去30日間の記事を読む。","mynotifications.message.nounread": "未読の通知はありません。","mynotifications.page.subtitle": "新着情報を確認する。",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "この記事はどうなっていますか? あなたのプランをユーザーに知らせてください...","showpost.votespanel.more": "+{extraVotesCount} 以上","showpost.votespanel.seedetails": "詳細を表示",- "signin.message.email": "サインインするメールアドレスを入力してください",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "メール認証は管理者によって無効にされています。管理者アカウントを持っていて、この制限を回避する必要がある場合は、<0>ここをクリック</0>してください。","signin.message.emailsent": "<0>{email}</0>に確認リンクを送信しました。リンクをクリックすると、サインインします。","signin.message.locked.text": "このサイトを再アクティブ化するには、管理者アカウントでサインインし、必要な設定を更新してください。",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "現在、管理者アカウントにのみサインインできます","signin.message.private.text": "アカウントや招待状をお持ちの場合は、以下のオプションを使用してサインインできます。","signin.message.private.title": "<0>{0}</0> はプライベートなスペースです。サインインして投票してください。",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}diff --git a/locale/ko/client.json b/locale/ko/client.jsonindex 082523e58..106484085 100644--- a/locale/ko/client.json+++ b/locale/ko/client.json@@ -82,7 +82,7 @@"label.voters": "Voters","labels.notagsavailable": "No tags available","legal.agreement": "I have read and agree to the <0/> and <1/>.",- "legal.notice": "By signing in, you agree to the <0/> and <1/>.",+ "legal.notice": "By signing in, you agree to the <2/><0/> and <1/>.","legal.privacypolicy": "Privacy Policy","legal.termsofservice": "Terms of Service","menu.administration": "Administration",@@ -103,7 +103,7 @@"modal.notifications.unread": "Unread notifications","modal.showvotes.message.zeromatches": "No users found matching <0>{0}</0>.","modal.showvotes.query.placeholder": "Search for users by name...",- "modal.signin.header": "Sign in to participate and vote",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Read on last 30 days.","mynotifications.message.nounread": "No unread notifications.","mynotifications.page.subtitle": "Stay up to date with what's happening",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "What's going on with this post? Let your users know what are your plans...","showpost.votespanel.more": "+{extraVotesCount} more","showpost.votespanel.seedetails": "see details",- "signin.message.email": "Enter your email address to sign in",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "Email authentication has been disabled by an administrator. If you have an administrator account and need to bypass this restriction, please <0>click here</0>.","signin.message.emailsent": "We have just sent a confirmation link to <0>{email}</0>. Click the link and you’ll be signed in.","signin.message.locked.text": "To reactivate this site, sign in with an administrator account and update the required settings.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Currently only allowed to sign in to an administrator account","signin.message.private.text": "If you have an account or an invitation, you may use following options to sign in.","signin.message.private.title": "<0>{0}</0> is a private space, you must sign in to participate and vote.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}diff --git a/locale/nl/client.json b/locale/nl/client.jsonindex 45f4394bc..8fe50fd25 100644--- a/locale/nl/client.json+++ b/locale/nl/client.json@@ -82,7 +82,7 @@"label.voters": "Stemmers","labels.notagsavailable": "No tags available","legal.agreement": "Ik heb de <0/> en <1/> gelezen en ga hiermee akkoord.",- "legal.notice": "Door in te loggen, ga je akkoord met de <0/> en <1/>.",+ "legal.notice": "Door in te loggen, ga je akkoord met de <2/><0/> en <1/>.","legal.privacypolicy": "Privacybeleid","legal.termsofservice": "Algemene voorwaarden","menu.administration": "Beheer",@@ -103,7 +103,7 @@"modal.notifications.unread": "Unread notifications","modal.showvotes.message.zeromatches": "Geen gebruikers gevonden voor <0>{0}</0>.","modal.showvotes.query.placeholder": "Zoek gebruikers op naam...",- "modal.signin.header": "Log in om mee te doen en te stemmen",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "In de afgelopen 30 dagen gelezen.","mynotifications.message.nounread": "Geen ongelezen meldingen.","mynotifications.page.subtitle": "Blijf op de hoogte van wat er gebeurt",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "Wat gebeurt er met dit bericht? Laat je gebruikers weten wat je plannen zijn...","showpost.votespanel.more": "+{extraVotesCount} meer","showpost.votespanel.seedetails": "details bekijken",- "signin.message.email": "Voer jouw e-mailadres in om in te loggen",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "Inloggen met e-mail is uitgeschakeld door een beheerder. Als u een beheerder account heeft en deze beperking moet omzeilen, <0>klik dan hier</0>.","signin.message.emailsent": "We hebben zojuist een bevestigingslink gestuurd naar <0>{email}</0>. Klik op de link om in te loggen.","signin.message.locked.text": "Meld aan met een beheerdersaccount en werk de vereiste instellingen bij, om deze site opnieuw te activeren.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Momenteel alleen toegestaan om in te loggen met een beheerdersaccount","signin.message.private.text": "Als je een account of een uitnodiging hebt, kun je de volgende methodes gebruiken om in te loggen.","signin.message.private.title": "<0>{0}</0> is a private space, you must sign in to participate and vote.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}diff --git a/locale/pl/client.json b/locale/pl/client.jsonindex a05718a36..bdac14b37 100644--- a/locale/pl/client.json+++ b/locale/pl/client.json@@ -82,7 +82,7 @@"label.voters": "Głosujący","labels.notagsavailable": "No tags available","legal.agreement": "Przeczytałem i zgadzam się z <0/> i <1/>.",- "legal.notice": "Logując się, zgadzasz się na <0/> i <1/>.",+ "legal.notice": "Logując się, akceptujesz <2/><0/> i <1/>.","legal.privacypolicy": "Polityka Prywatności","legal.termsofservice": "Warunki Świadczenia Usług","menu.administration": "Administracja",@@ -103,7 +103,7 @@"modal.notifications.unread": "Unread notifications","modal.showvotes.message.zeromatches": "Nie znaleziono użytkowników pasujących do <0>{0}</0>.","modal.showvotes.query.placeholder": "Wyszukaj użytkowników według nazwy...",- "modal.signin.header": "Zaloguj się aby wziąć udział i głosować",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Przeczytaj ostatnie 30 dni.","mynotifications.message.nounread": "Brak nowych powiadomień.","mynotifications.page.subtitle": "Bądź na bieżąco z tym, co się dzieje",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "Co się dzieje w temacie tego posta? Daj swoim użytkownikom znać o swoich planach...","showpost.votespanel.more": "+{extraVotesCount} więcej","showpost.votespanel.seedetails": "pokaż szczegóły",- "signin.message.email": "Podaj swój adres email aby się zalogować",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "Autoryzacja za pomocą adresu email została wyłączona przez administratora. Jeśli posiadasz konto administratora i chcesz obejść to ograniczenie <0>kliknij tutaj</0>.","signin.message.emailsent": "Przed chwilą wysłaliśmy link autoryzacyjny na <0>{email}</0>. Kliknij w niego aby się zalogować.","signin.message.locked.text": "Aby reaktywować tą stronę zaloguj się na konto administratora i zmień wymagane ustawienia.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Obecnie możliwe jest logowanie tylko na konto administratora","signin.message.private.text": "Jeśli posiadasz konto lub zaproszenie możesz użyć poniższych opcji aby się zalogować.","signin.message.private.title": "<0>{0}</0> to przestrzeń prywatna, musisz się zalogować, aby uczestniczyć i głosować.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} few {# tagów} many {# tagów} other {# tagi}}"}diff --git a/locale/pt-BR/client.json b/locale/pt-BR/client.jsonindex 16e62ada2..6b781a142 100644--- a/locale/pt-BR/client.json+++ b/locale/pt-BR/client.json@@ -81,8 +81,8 @@"label.unsubscribe": "Desinscrever-se","label.voters": "Votantes","labels.notagsavailable": "No tags available",- "legal.agreement": "Eu li e concordo com os <0/> e <1/>.",- "legal.notice": "Ao fazer o login, você aceita os <0/> e <1/>.",+ "legal.agreement": "I have read and agree to the <0/> and <1/>.",+ "legal.notice": "Ao fazer o login, você concorda com os <2/><0/> e <1/>.","legal.privacypolicy": "Política de Privacidade","legal.termsofservice": "Termos do Serviço","menu.administration": "Administração",@@ -103,7 +103,7 @@"modal.notifications.unread": "Unread notifications","modal.showvotes.message.zeromatches": "Nenhum usuário encontrado para <0>{0}</0>.","modal.showvotes.query.placeholder": "Procurar usuários por nome...",- "modal.signin.header": "Faça login para participar e votar",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Lido nos últimos 30 dias.","mynotifications.message.nounread": "Nenhuma notificação não lida.","mynotifications.page.subtitle": "Mantenha-se atualizado com o que está acontecendo",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "O que está acontecendo com esta postagem? Informe seus usuários quais são os seus planos...","showpost.votespanel.more": "+{extraVotesCount} mais","showpost.votespanel.seedetails": "ver detalhes",- "signin.message.email": "Digite seu endereço de e-mail para fazer login",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "A autenticação por e-mail foi desativada por um administrador. Se você tem uma conta de administrador e precisa ignorar esta restrição, <0>clique aqui</0>.","signin.message.emailsent": "Acabamos de enviar um link de confirmação para <0>{email}</0>. Clique no link para iniciar a sessão.","signin.message.locked.text": "Para reativar este site, entre com uma conta de administrador e atualize as configurações necessárias.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Atualmente, só é permitido entrar em uma conta de administrador","signin.message.private.text": "Se você tem uma conta ou um convite, você pode usar as seguintes opções para fazer o login.","signin.message.private.title": "<0>{0}</0> é um espaço privado, você deve se inscrever para participar e votar.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}diff --git a/locale/ru/client.json b/locale/ru/client.jsonindex 97e2ab382..6739c7395 100644--- a/locale/ru/client.json+++ b/locale/ru/client.json@@ -82,7 +82,7 @@"label.voters": "Проголосовавшие","labels.notagsavailable": "No tags available","legal.agreement": "Я прочитал и согласен с <0/> и <1/>.",- "legal.notice": "Регистрируясь, вы соглашаетесь с <0/> и <1/>.",+ "legal.notice": "Войдя в систему, вы соглашаетесь с <2/><0/> и <1/>.","legal.privacypolicy": "Политика Конфиденциальности","legal.termsofservice": "Условия Использования","menu.administration": "Администрирование",@@ -103,7 +103,7 @@"modal.notifications.unread": "Непрочитанные уведомления","modal.showvotes.message.zeromatches": "Не удалось найти пользователей с <0>{0}</0>.","modal.showvotes.query.placeholder": "Найдите пользователей по их имени...",- "modal.signin.header": "Войдите в систему для участия и голосования",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Прочитанные за 30 дней.","mynotifications.message.nounread": "Нет непрочитанных уведомлений.","mynotifications.page.subtitle": "Будьте в курсе того, что здесь происходит",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "Что произойдёт с этим предложением? Дайте людям знать о ваших планах...","showpost.votespanel.more": "и ещё {extraVotesCount}","showpost.votespanel.seedetails": "подробнее",- "signin.message.email": "Введите ваш адрес электронной почты, чтобы войти",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "Аутентификация по адресу электронной почты отключена. <0>Я администратор и мне нужно обойти это ограничение</0>.","signin.message.emailsent": "Мы отправили ссылку для подтверждения на <0>{email}</0>. Перейдите по ней, чтобы войти.","signin.message.locked.text": "Чтобы заново активировать этот сайт, войдите с аккаунта администратора и обновите соответствующие настройки.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Сейчас войти можно только с аккаунта администратора","signin.message.private.text": "Если у вас есть аккаунт или приглашение, вы можете использовать их для входа.","signin.message.private.title": "<0>{0}</0> является приватным пространством, вы должны войти в систему, чтобы принять участие и проголосовать.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}diff --git a/locale/si-LK/client.json b/locale/si-LK/client.jsonindex af1ad3293..5c4c291fc 100644--- a/locale/si-LK/client.json+++ b/locale/si-LK/client.json@@ -82,7 +82,7 @@"label.voters": "Voters","labels.notagsavailable": "No tags available","legal.agreement": "I have read and agree to the <0/> and <1/>.",- "legal.notice": "By signing in, you agree to the <0/> and <1/>.",+ "legal.notice": "By signing in, you agree to the <2/><0/> and <1/>.","legal.privacypolicy": "Privacy Policy","legal.termsofservice": "Terms of Service","menu.administration": "Administration",@@ -103,7 +103,7 @@"modal.notifications.unread": "Unread notifications","modal.showvotes.message.zeromatches": "No users found matching <0>{0}</0>.","modal.showvotes.query.placeholder": "Search for users by name...",- "modal.signin.header": "Sign in to participate and vote",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Read on last 30 days.","mynotifications.message.nounread": "No unread notifications.","mynotifications.page.subtitle": "Stay up to date with what's happening",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "What's going on with this post? Let your users know what are your plans...","showpost.votespanel.more": "+{extraVotesCount} more","showpost.votespanel.seedetails": "see details",- "signin.message.email": "Enter your email address to sign in",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "Email authentication has been disabled by an administrator. If you have an administrator account and need to bypass this restriction, please <0>click here</0>.","signin.message.emailsent": "We have just sent a confirmation link to <0>{email}</0>. Click the link and you’ll be signed in.","signin.message.locked.text": "To reactivate this site, sign in with an administrator account and update the required settings.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Currently only allowed to sign in to an administrator account","signin.message.private.text": "If you have an account or an invitation, you may use following options to sign in.","signin.message.private.title": "<0>{0}</0> is a private space, you must sign in to participate and vote.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}diff --git a/locale/sk/client.json b/locale/sk/client.jsonindex c6fa0fdbf..c67b78202 100644--- a/locale/sk/client.json+++ b/locale/sk/client.json@@ -82,7 +82,7 @@"label.voters": "Hlasujúci","labels.notagsavailable": "No tags available","legal.agreement": "Prečítal som a súhlasím s <0/> a <1/>.",- "legal.notice": "Prihlásením súhlasíte s <0/> a <1/>.",+ "legal.notice": "By signing in, you agree to the <2/><0/> and <1/>.","legal.privacypolicy": "Zásady ochrany osobných údajov","legal.termsofservice": "Podmienky služby","menu.administration": "Administrácia",@@ -103,7 +103,7 @@"modal.notifications.unread": "Unread notifications","modal.showvotes.message.zeromatches": "Nenašli sa žiadni používatelia <0>{0}</0>.","modal.showvotes.query.placeholder": "Vyhľadajte používateľov podľa mena...",- "modal.signin.header": "Ak sa chcete zúčastniť diskusie a hlasovať, prihláste sa",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Prečítajte si posledných 30 dní.","mynotifications.message.nounread": "Žiadne neprečítané upozornenia.","mynotifications.page.subtitle": "Majte prehľad o tom, čo sa deje",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "Čo sa deje s týmto príspevkom? Dajte svojim používateľom vedieť, aké máte plány...","showpost.votespanel.more": "+{extraVotesCount} viac","showpost.votespanel.seedetails": "pozri detaily",- "signin.message.email": "Prihláste sa zadaním svojej emailovej adresy",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "Správca zakázal overovanie emailu. Ak máte účet správcu a potrebujete obísť toto obmedzenie, <0>kliknite sem</0>.","signin.message.emailsent": "Práve sme odoslali potvrdzovací odkaz na adresu <0>{email}</0>. Kliknite na odkaz a budete prihlásení.","signin.message.locked.text": "Ak chcete túto stránku znova aktivovať, prihláste sa pomocou účtu správcu a aktualizujte požadované nastavenia.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "V súčasnosti je povolené iba prihlásenie do účtu správcu","signin.message.private.text": "Ak máte účet alebo pozvánku, na prihlásenie môžete použiť nasledujúce možnosti.","signin.message.private.title": "<0>{0}</0> je súkromný priestor, ak sa chcete zúčastniť diskusie a hlasovať, musíte sa prihlásiť.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}diff --git a/locale/sv-SE/client.json b/locale/sv-SE/client.jsonindex f31513a83..7a0a37916 100644--- a/locale/sv-SE/client.json+++ b/locale/sv-SE/client.json@@ -82,7 +82,7 @@"label.voters": "Röstande","labels.notagsavailable": "No tags available","legal.agreement": "Jag har läst och godkänner <0/> och <1/>.",- "legal.notice": "Genom att logga in samtycker du till <0/> och <1/>.",+ "legal.notice": "Genom att logga in godkänner du <2/><0/> och <1/>.","legal.privacypolicy": "Integritetspolicy","legal.termsofservice": "Användarvillkor","menu.administration": "Administration",@@ -103,7 +103,7 @@"modal.notifications.unread": "Unread notifications","modal.showvotes.message.zeromatches": "Inga användare hittades som matchar <0>{0}</0>.","modal.showvotes.query.placeholder": "Sök efter användare med namn...",- "modal.signin.header": "Logga in för att delta och rösta",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Läst de senaste 30 dagarna.","mynotifications.message.nounread": "Inga olästa aviseringar.","mynotifications.page.subtitle": "Håll dig uppdaterad om vad som händer",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "Vad händer med det här inlägget? Låt dina användare veta vad du planerar...","showpost.votespanel.more": "+{extraVotesCount} ytterligare","showpost.votespanel.seedetails": "visa detaljer",- "signin.message.email": "Ange din e-postadress för att logga in",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "E-postautentisering har inaktiverats av en administratör. Om du har ett administratörskonto och behöver kringgå denna begränsning, <0>klicka här</0>.","signin.message.emailsent": "Vi har skickat en bekräftelselänk till <0>{email}</0>. Klicka på länken för att logga in.","signin.message.locked.text": "För att återaktivera denna webbplats, logga in med ett administratörskonto och uppdatera nödvändiga inställningar.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "För närvarande endast tillåtet att logga in med ett administratörskonto","signin.message.private.text": "Om du har ett konto eller en inbjudan kan du använda följande alternativ för att logga in.","signin.message.private.title": "<0>{0}</0> är ett privat utrymme, du måste logga in för att delta och rösta.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, =1 {# etikett} other {# etiketter}}"}diff --git a/locale/tr/client.json b/locale/tr/client.jsonindex b8c4c2b4d..e598172fd 100644--- a/locale/tr/client.json+++ b/locale/tr/client.json@@ -82,7 +82,7 @@"label.voters": "Oy verenler","labels.notagsavailable": "No tags available","legal.agreement": "<0/> ve <1/> okudum ve onayladım.",- "legal.notice": "Kayıt olarak <0/> ve <1/> kabul etmiş olursunuz.",+ "legal.notice": "By signing in, you agree to the <2/><0/> and <1/>.","legal.privacypolicy": "Gizlilik Politikası","legal.termsofservice": "Hizmet Koşulları","menu.administration": "Yönetim",@@ -103,7 +103,7 @@"modal.notifications.unread": "Unread notifications","modal.showvotes.message.zeromatches": "Eşleşen kullanıcı bulunamadı <0>{0}</0>.","modal.showvotes.query.placeholder": "Kullanıcıları ismiyle arayın...",- "modal.signin.header": "Öneride bulunmak ve oy vermek için giriş yapın",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "Son 30 gün içinde okunmuş.","mynotifications.message.nounread": "Okunmamış bildirim yok.","mynotifications.page.subtitle": "Neler olduğundan haberdar olun",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "Bu öneriye neler oluyor? Kullanıcılara planlarınız hakkında bilgi verin...","showpost.votespanel.more": "+{extraVotesCount} daha","showpost.votespanel.seedetails": "ayrıntıları gör",- "signin.message.email": "Kayıt olmak için e-posta adresinizi girin",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "E-posta doğrulaması bir yönetici tarafından devre dışı bırakıldı. Eğer bir yönetici hesabınız varsa ve bu kısıtı kaldırmak istiyorsanız <0>buraya tıklayın</0>.","signin.message.emailsent": "<0>{email}</0> e bir onay bağlantısı gönderdik. Bağlantıya tıkladığınızda kaydınız tamamlanacak.","signin.message.locked.text": "Sayfayı tekrar aktive etmek için yönetici hesabıyla giriş yapın ve ve gerekli ayarları değiştirin.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "Şu anda yalnızca yönetici hesabıyla giriş yapılabilir","signin.message.private.text": "Eğer bir hesabınız ya da davetiyeniz varsa aşağıdaki seçenekleri kullanarak giriş yapabilirsiniz.","signin.message.private.title": "<0>{0}</0> özel bir alandır ve katılabilmek için davetiye almanız gerekir.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# etiket} other {# etiket}}"}diff --git a/locale/zh-CN/client.json b/locale/zh-CN/client.jsonindex 9a88f42d4..b0505879d 100644--- a/locale/zh-CN/client.json+++ b/locale/zh-CN/client.json@@ -81,8 +81,8 @@"label.unsubscribe": "取消订阅","label.voters": "投票者","labels.notagsavailable": "No tags available",- "legal.agreement": "我已阅读并同意 <0/> 和 <1/>.",- "legal.notice": "登录即表示您同意 <0/> and <1/>.",+ "legal.agreement": "I have read and agree to the <0/> and <1/>.",+ "legal.notice": "在签署时,您同意<2/><0/>和<1/>。","legal.privacypolicy": "隐私政策","legal.termsofservice": "服务条款","menu.administration": "管理",@@ -103,7 +103,7 @@"modal.notifications.unread": "未读通知","modal.showvotes.message.zeromatches": "未找到匹配的用户 <0>{0}</0>.","modal.showvotes.query.placeholder": "按名称搜索用户...",- "modal.signin.header": "登录参与投票",+ "modal.signin.header": "Submit your feedback","mynotifications.label.readrecently": "过去30天阅读.","mynotifications.message.nounread": "无未读通知.","mynotifications.page.subtitle": "及时了解正在发生的事情",@@ -169,7 +169,8 @@"showpost.responseform.text.placeholder": "这篇文章怎么了?让你的用户知道你的计划是什么...","showpost.votespanel.more": "+{extraVotesCount} 更多","showpost.votespanel.seedetails": "查看详细信息",- "signin.message.email": "输入您的电子邮件地址以登录",+ "signin.email.placeholder": "Email address",+ "signin.message.email": "Continue with email","signin.message.emaildisabled": "管理员已禁用电子邮件身份验证。如果您有管理员帐户并且需要绕过此限制,请 <0>点击这里</0>.","signin.message.emailsent": "我们刚刚向发送了一个确认链接 <0>{email}</0>. 单击链接,您将登录.","signin.message.locked.text": "要重新激活此网站,请使用管理员帐户登录并更新所需的设置.",@@ -177,5 +178,6 @@"signin.message.onlyadmins": "目前只允许登录管理员帐户","signin.message.private.text": "如果您有帐户或邀请,您可以使用以下选项登录.","signin.message.private.title": "<0>{0}</0> 这是一个私人空间,您必须登录才能参与和投票.",+ "signin.message.socialbutton.intro": "Log in with","{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"}diff --git a/public/assets/styles/utility/text.scss b/public/assets/styles/utility/text.scssindex b4b260ba6..4a0aa8049 100644--- a/public/assets/styles/utility/text.scss+++ b/public/assets/styles/utility/text.scss@@ -113,6 +113,10 @@ pre:last-child {text-align: center;}+.text-left {+ text-align: left;+}+.text-medium {font-weight: get("font.weight.medium");}diff --git a/public/components/Header.tsx b/public/components/Header.tsxindex 9a79b39d1..358dc9281 100644--- a/public/components/Header.tsx+++ b/public/components/Header.tsx@@ -33,9 +33,12 @@ export const Header = () => {</HStack>)}{!fider.session.isAuthenticated && (- <a href="#" className="uppercase text-sm" onClick={showModal}>- <Trans id="action.signin">Sign in</Trans>- </a>+ <HStack spacing={2}>+ <ThemeSwitcher />+ <a href="#" className="uppercase text-sm" onClick={showModal}>+ <Trans id="action.signin">Sign in</Trans>+ </a>+ </HStack>)}</HStack></div>diff --git a/public/components/SignInModal.tsx b/public/components/SignInModal.tsxindex e7153c402..b160517ce 100644--- a/public/components/SignInModal.tsx+++ b/public/components/SignInModal.tsx@@ -1,7 +1,8 @@import React, { useState, useEffect } from "react"-import { Modal, SignInControl, LegalFooter } from "@fider/components"-import { Button } from "./common"+import { Modal, SignInControl, LegalFooter, TenantLogo } from "@fider/components"+import { Button, CloseIcon } from "./common"import { Trans } from "@lingui/react/macro"+import { HStack, VStack } from "./layout"interface SignInModalProps {isOpen: boolean@@ -46,7 +47,15 @@ export const SignInModal: React.FC<SignInModalProps> = (props) => {return (<Modal.Window isOpen={props.isOpen} onClose={closeModal}><Modal.Header>- <Trans id="modal.signin.header">Sign in to participate and vote</Trans>+ <VStack spacing={8}>+ <HStack justify="between">+ <TenantLogo size={24} useFiderIfEmpty={true} />+ <CloseIcon closeModal={closeModal} />+ </HStack>+ <p>+ <Trans id="modal.signin.header">Submit your feedback</Trans>+ </p>+ </VStack></Modal.Header><Modal.Content>{content}</Modal.Content><LegalFooter />diff --git a/public/components/ThemeSwitcher.tsx b/public/components/ThemeSwitcher.tsxindex 6fac8348c..3903deba3 100644--- a/public/components/ThemeSwitcher.tsx+++ b/public/components/ThemeSwitcher.tsx@@ -3,12 +3,13 @@ import IconSun from "@fider/assets/images/heroicons-sun.svg"import React, { useEffect, useState } from "react"import { Icon } from "./common"import "./ThemeSwitcher.scss"+import { cache } from "@fider/services/cache"type themeType = "light" | "dark"export const ThemeSwitcher = () => {// Lazy initialization of the theme state- const [currentTheme, setCurrentTheme] = useState<themeType>((localStorage.getItem("theme") as themeType) || "light")+ const [currentTheme, setCurrentTheme] = useState<themeType>((cache.local.get("theme") as themeType) || "light")const toggleTheme = () => {const newTheme = currentTheme === "light" ? "dark" : "light"@@ -16,7 +17,7 @@ export const ThemeSwitcher = () => {}useEffect(() => {- localStorage.setItem("theme", currentTheme)+ cache.local.set("theme", currentTheme)document.body.setAttribute("data-theme", currentTheme)}, [currentTheme])diff --git a/public/components/common/Button.scss b/public/components/common/Button.scssindex 7d655c6fc..73ce38b5e 100644--- a/public/components/common/Button.scss+++ b/public/components/common/Button.scss@@ -73,7 +73,7 @@}&--default {- padding: 8px 12px;+ padding: 11px 12px;font-size: get("font.size.sm");svg,diff --git a/public/components/common/Legal.tsx b/public/components/common/Legal.tsxindex a0d9df924..04866faeb 100644--- a/public/components/common/Legal.tsx+++ b/public/components/common/Legal.tsx@@ -38,9 +38,10 @@ export const LegalNotice = () => {if (fider.settings.hasLegal) {return (- <p className="text-muted">+ <p className="px-9"><Trans id="legal.notice">- By signing in, you agree to the <PrivacyPolicy /> and <TermsOfService />.+ By signing in, you agree to the+ <PrivacyPolicy /> and <TermsOfService /> <br />.</Trans></p>)diff --git a/public/components/common/Logo.tsx b/public/components/common/Logo.tsxindex 16b666a85..98ce12be4 100644--- a/public/components/common/Logo.tsx+++ b/public/components/common/Logo.tsx@@ -24,7 +24,7 @@ export const TenantLogo = ({ size, useFiderIfEmpty = false }: TenantLogoProps) =if (tenant && tenant.logoBlobKey) {return <img src={TenantLogoURL(fider.session.tenant, size)} alt={tenant.name} />} else if (useFiderIfEmpty) {- return <img src="https://fider.io/images/logo-100x100.png" alt="Fider" />+ return <img src="https://fider.io/images/logo-100x100.png" alt="Fider" height={size} width={size} />}return null}diff --git a/public/components/common/Modal.scss b/public/components/common/Modal.scssindex f35291964..96bb5ed2a 100644--- a/public/components/common/Modal.scss+++ b/public/components/common/Modal.scss@@ -56,7 +56,7 @@ $c-modal-dimmer-padding: 1em;text-align: left;background: var(--colors-white);border: none;- border-radius: 3px;+ border-radius: 12px;animation: windowfadeIn 0.5s;&--small {@@ -80,20 +80,30 @@ $c-modal-dimmer-padding: 1em;.c-modal-header {font-size: get("font.size.lg");font-weight: 600;- padding: 15px 20px;- border-bottom: 1px solid var(--colors-gray-200);+ padding: 20px;+ // border-bottom: 1px solid get("colors.gray.200");}.c-modal-content {padding: 15px 20px;}+ .c-modal-closeicon {+ color: get("colors.gray.400");+ cursor: pointer;+ transition: color 0.2s ease;++ &:hover {+ color: get("colors.gray.600");+ }+ }+.c-modal-footer {- background: var(--colors-gray-100);+ // background: get("colors.gray.100");padding: 10px;border-bottom-right-radius: 3px;border-bottom-left-radius: 3px;- border-top: 1px solid var(--colors-gray-300);+ // border-top: 1px solid get("colors.gray.300");&--right {text-align: right;}diff --git a/public/components/common/Modal.tsx b/public/components/common/Modal.tsxindex 972c95d8f..c149b4359 100644--- a/public/components/common/Modal.tsx+++ b/public/components/common/Modal.tsx@@ -3,6 +3,8 @@ import "./Modal.scss"import React, { useEffect, useRef } from "react"import ReactDOM from "react-dom"import { classSet } from "@fider/services"+import { Icon } from "@fider/components"+import IconX from "@fider/assets/images/heroicons-x.svg"interface ModalWindowProps {children?: React.ReactNode@@ -82,6 +84,10 @@ const Footer = (props: ModalFooterProps) => {return <div className={className}>{props.children}</div>}+export const CloseIcon = ({ closeModal }: { closeModal: () => void }) => (+ <Icon sprite={IconX} height="30" width="30" onClick={closeModal} className="c-modal-closeicon" />+)+export const Modal = {Window: ModalWindow,Header,diff --git a/public/components/common/SignInControl.scss b/public/components/common/SignInControl.scssindex 9d9b2e589..69d705659 100644--- a/public/components/common/SignInControl.scss+++ b/public/components/common/SignInControl.scss@@ -1,9 +1,38 @@@import "~@fider/assets/styles/variables.scss";.c-signin-control {+ padding-left: 45px;+ padding-right: 45px;+ padding-bottom: 40px;+&__oauth {- display: grid;- grid-template-columns: 1fr 1fr 1fr;- gap: spacing(2);+ display: flex;+ flex-direction: column;+ align-content: stretch;+ width: 100%;++ > *:not(:last-child) {+ margin-bottom: spacing(3);+ }+ }+}++.c-signin-social-button {+ background: none;+ border: 1px solid get("colors.gray.700");+ border-radius: 6px;+ display: inline-flex;+ justify-content: center;+ align-items: center;+ padding-top: spacing(3);+ padding-bottom: spacing(3);+ img {+ height: sizing(5);+ padding-right: spacing(3);+ }+ span {+ color: get("colors.gray.700");+ font-size: get("font.size.base");+ font-weight: 500;}}diff --git a/public/components/common/SignInControl.tsx b/public/components/common/SignInControl.tsxindex b258e1cf4..058a62a0e 100644--- a/public/components/common/SignInControl.tsx+++ b/public/components/common/SignInControl.tsx@@ -6,6 +6,7 @@ import { Divider } from "@fider/components/layout"import { device, actions, Failure, isCookieEnabled } from "@fider/services"import { useFider } from "@fider/hooks"import { Trans } from "@lingui/react/macro"+import { i18n } from "@lingui/core"interface SignInControlProps {useEmail: boolean@@ -52,7 +53,7 @@ export const SignInControl: React.FunctionComponent<SignInControlProps> = (props<div className="c-signin-control">{providersLen > 0 && (<>- <div className="c-signin-control__oauth mb-2">+ <div className="c-signin-control__oauth pb-3">{fider.settings.oauth.map((o) => (<React.Fragment key={o.provider}><SocialSignInButton option={o} redirectTo={props.redirectTo} />@@ -65,23 +66,19 @@ export const SignInControl: React.FunctionComponent<SignInControlProps> = (props{props.useEmail &&(showEmailForm ? (- <div>- <p>- <Trans id="signin.message.email">Enter your email address to sign in</Trans>- </p>+ <div className="pt-3"><Form error={error}><Input+ className="text-left"field="email"value={email}autoFocus={!device.isTouch()}onChange={setEmail}- placeholder="[email protected]"- suffix={- <Button type="submit" variant="primary" disabled={email === ""} onClick={signIn}>- <Trans id="action.signin">Sign in</Trans>- </Button>- }+ placeholder={i18n._("signin.email.placeholder", { message: "Email address" })}/>+ <Button className="w-full justify-center" type="submit" variant="primary" disabled={email === ""} onClick={signIn}>+ <Trans id="action.signin">Sign in</Trans>+ </Button></Form>{!fider.session.tenant.isEmailAuthAllowed && (<p className="text-red-700 mt-1">diff --git a/public/components/common/SocialSignInButton.tsx b/public/components/common/SocialSignInButton.tsxindex 5e14ee5b8..8468eb6a3 100644--- a/public/components/common/SocialSignInButton.tsx+++ b/public/components/common/SocialSignInButton.tsx@@ -1,5 +1,6 @@import React from "react"-import { Button, OAuthProviderLogo } from "@fider/components"+import { OAuthProviderLogo } from "@fider/components"+import { Trans } from "@lingui/react/macro"interface SocialSignInButtonProps {option: {@@ -18,9 +19,13 @@ export const SocialSignInButton = (props: SocialSignInButtonProps) => {const href = props.option.url ? `${props.option.url}?redirect=${redirectTo}` : undefinedreturn (- <Button href={href} rel="nofollow" className={props.className}>+ <a rel="nofollow" className="c-signin-social-button" href={href}>{props.option.logoURL ? <img alt={props.option.displayName} src={props.option.logoURL} /> : <OAuthProviderLogo option={props.option} />}- <span>{props.option.displayName}</span>- </Button>+ <span>+ <Trans id="signin.message.socialbutton.intro">Sign in with</Trans>+ + {props.option.displayName}+ </span>+ </a>)}diff --git a/public/components/common/form/Input.tsx b/public/components/common/form/Input.tsxindex 156d2f6d8..722e5ee6e 100644--- a/public/components/common/form/Input.tsx+++ b/public/components/common/form/Input.tsx@@ -54,7 +54,7 @@ export const Input: React.FunctionComponent<InputProps> = (props) => {{props.afterLabel}</label>)}- <HStack spacing={0} align={props.icon ? "center" : "start"} className="relative">+ <HStack spacing={0} align={props.icon ? "center" : undefined} className="relative"><inputclassName={classSet({"c-input": true,diff --git a/public/components/layout/Divider.scss b/public/components/layout/Divider.scssindex a7c7f62c7..dc60a9a52 100644--- a/public/components/layout/Divider.scss+++ b/public/components/layout/Divider.scss@@ -1,7 +1,7 @@.c-divider {display: table;font-weight: 500;- margin: 16px 0px;+ margin: 26px 0px;&::before,&::after {diff --git a/public/pages/Administration/pages/ManageMembers.page.tsx b/public/pages/Administration/pages/ManageMembers.page.tsxindex 4ed17c0a4..faf034b09 100644--- a/public/pages/Administration/pages/ManageMembers.page.tsx+++ b/public/pages/Administration/pages/ManageMembers.page.tsx@@ -186,7 +186,7 @@ export default class ManageMembersPage extends AdminBasePage<ManageMembersPagePr<strong>Collaborators</strong> can edit and manage content, but not permissions and settings.</li><li>- <strong>Blocked</strong> users are unable to log into this site.+ <strong>Blocked</strong> users are unable to sign into this site.</li></ul></>diff --git a/public/pages/ShowPost/ShowPost.page.tsx b/public/pages/ShowPost/ShowPost.page.tsxindex c10d80c18..08408ea42 100644--- a/public/pages/ShowPost/ShowPost.page.tsx+++ b/public/pages/ShowPost/ShowPost.page.tsx@@ -1,6 +1,6 @@import "./ShowPost.page.scss"-import React from "react"+import React, { useState, useEffect, useCallback } from "react"import { Comment, Post, Tag, Vote, ImageUpload, CurrentUser, PostStatus } from "@fider/models"import { actions, clearUrlHash, Failure, Fider, notify, timeAgo } from "@fider/services"@@ -45,17 +45,6 @@ interface ShowPostPageProps {attachments: string[]}-interface ShowPostPageState {- editMode: boolean- newTitle: string- showDeleteModal: boolean- showResponseModal: boolean- attachments: ImageUpload[]- newDescription: string- highlightedComment?: number- error?: Failure-}-const oneHour = 3600const canEditPost = (user: CurrentUser, post: Post) => {if (user.isCollaborator) {@@ -65,244 +54,219 @@ const canEditPost = (user: CurrentUser, post: Post) => {return user.id === post.user.id && timeAgo(post.createdAt) <= oneHour}-export default class ShowPostPage extends React.Component<ShowPostPageProps, ShowPostPageState> {- constructor(props: ShowPostPageProps) {- super(props)+export default function ShowPostPage(props: ShowPostPageProps) {+ const [editMode, setEditMode] = useState(false)+ const [showDeleteModal, setShowDeleteModal] = useState(false)+ const [showResponseModal, setShowResponseModal] = useState(false)+ const [newTitle, setNewTitle] = useState(props.post.title)+ const [newDescription, setNewDescription] = useState(props.post.description)+ const [attachments, setAttachments] = useState<ImageUpload[]>([])+ const [highlightedComment, setHighlightedComment] = useState<number | undefined>(undefined)+ const [error, setError] = useState<Failure | undefined>(undefined)- this.state = {- editMode: false,- showDeleteModal: false,- showResponseModal: false,- newTitle: this.props.post.title,- newDescription: this.props.post.description,- attachments: [],- }- }+ const handleHashChange = useCallback(+ (e?: Event) => {+ const hash = window.location.hash+ const result = /#comment-([0-9]+)/.exec(hash)- public componentDidMount() {- this.handleHashChange()- window.addEventListener("hashchange", this.handleHashChange)- }+ let newHighlightedComment+ if (result === null) {+ // No match+ newHighlightedComment = undefined+ } else {+ // Match, extract numeric ID+ const id = parseInt(result[1])+ if (props.comments.map((comment) => comment.id).includes(id)) {+ newHighlightedComment = id+ } else {+ // Unknown comment+ if (e?.cancelable) {+ e.preventDefault()+ } else {+ clearUrlHash(true)+ }+ notify.error(<Trans id="showpost.comment.unknownhighlighted">Unknown comment ID #{id}</Trans>)+ newHighlightedComment = undefined+ }+ }+ setHighlightedComment(newHighlightedComment)+ },+ [props.comments]+ )- public componentWillUnmount() {- window.removeEventListener("hashchange", this.handleHashChange)- }+ useEffect(() => {+ handleHashChange()+ window.addEventListener("hashchange", handleHashChange)+ return () => {+ window.removeEventListener("hashchange", handleHashChange)+ }+ }, [handleHashChange])- private saveChanges = async () => {- const result = await actions.updatePost(this.props.post.number, this.state.newTitle, this.state.newDescription, this.state.attachments)+ const saveChanges = async () => {+ const result = await actions.updatePost(props.post.number, newTitle, newDescription, attachments)if (result.ok) {location.reload()} else {- this.setState({- error: result.error,- })+ setError(result.error)}}- private canDeletePost = () => {- const status = PostStatus.Get(this.props.post.status)+ const canDeletePost = () => {+ const status = PostStatus.Get(props.post.status)if (!Fider.session.isAuthenticated || !Fider.session.user.isAdministrator || status.closed) {return false}return true}- private setNewTitle = (newTitle: string) => {- this.setState({ newTitle })- }-- private setNewDescription = (newDescription: string) => {- this.setState({ newDescription })- }-- private setAttachments = (attachments: ImageUpload[]) => {- this.setState({ attachments })+ const cancelEdit = () => {+ setError(undefined)+ setEditMode(false)}- private setShowDeleteModal = (showDeleteModal: boolean) => {- this.setState({ showDeleteModal })- }-- private setShowResponseModal = (showResponseModal: boolean) => {- this.setState({ showResponseModal })- }-- private cancelEdit = async () => {- this.setState({ error: undefined, editMode: false })- }-- private startEdit = async () => {- this.setState({ editMode: true })- }-- private handleHashChange = (e?: Event) => {- const hash = window.location.hash- const result = /#comment-([0-9]+)/.exec(hash)-- let highlightedComment- if (result === null) {- // No match- highlightedComment = undefined- } else {- // Match, extract numeric ID- const id = parseInt(result[1])- if (this.props.comments.map((comment) => comment.id).includes(id)) {- highlightedComment = id- } else {- // Unknown comment- if (e?.cancelable) {- e.preventDefault()- } else {- clearUrlHash(true)- }- notify.error(<Trans id="showpost.comment.unknownhighlighted">Unknown comment ID #{id}</Trans>)- highlightedComment = undefined- }- }- this.setState({ highlightedComment })+ const startEdit = () => {+ setEditMode(true)}- public onActionSelected = (action: "copy" | "delete" | "status" | "edit") => () => {+ const onActionSelected = (action: "copy" | "delete" | "status" | "edit") => () => {if (action === "copy") {navigator.clipboard.writeText(window.location.href)notify.success(<Trans id="showpost.copylink.success">Link copied to clipboard</Trans>)} else if (action === "delete") {- this.setShowDeleteModal(true)+ setShowDeleteModal(true)} else if (action === "status") {- this.setShowResponseModal(true)+ setShowResponseModal(true)} else if (action === "edit") {- this.startEdit()+ startEdit()}}- public render() {- return (- <>- <Header />- <div id="p-show-post" className="page container">- <div className="p-show-post">- <div className="p-show-post__main-col">- <div className="p-show-post__header-col">- <VStack spacing={8}>- <HStack justify="between">- <VStack align="start">- {!this.state.editMode && (- <HStack>- <Avatar user={this.props.post.user} />- <VStack spacing={1}>- <UserName user={this.props.post.user} />- <Moment className="text-muted" locale={Fider.currentLocale} date={this.props.post.createdAt} />- </VStack>- </HStack>- )}- </VStack>-- {!this.state.editMode && (- <Dropdown position="left" renderHandle={<Icon sprite={IconDotsHorizontal} width="24" height="24" />}>- <Dropdown.ListItem onClick={this.onActionSelected("copy")}>- <Trans id="action.copylink">Copy link</Trans>- </Dropdown.ListItem>- {Fider.session.isAuthenticated && canEditPost(Fider.session.user, this.props.post) && (- <>- <Dropdown.ListItem onClick={this.onActionSelected("edit")}>- <Trans id="action.edit">Edit</Trans>- </Dropdown.ListItem>- {Fider.session.user.isCollaborator && (- <Dropdown.ListItem onClick={this.onActionSelected("status")}>- <Trans id="action.respond">Respond</Trans>- </Dropdown.ListItem>- )}- </>- )}- {this.canDeletePost() && (- <Dropdown.ListItem onClick={this.onActionSelected("delete")} className="text-red-700">- <Trans id="action.delete">Delete</Trans>- </Dropdown.ListItem>- )}- </Dropdown>+ return (+ <>+ <Header />+ <div id="p-show-post" className="page container">+ <div className="p-show-post">+ <div className="p-show-post__main-col">+ <div className="p-show-post__header-col">+ <VStack spacing={8}>+ <HStack justify="between">+ <VStack align="start">+ {!editMode && (+ <HStack>+ <Avatar user={props.post.user} />+ <VStack spacing={1}>+ <UserName user={props.post.user} />+ <Moment className="text-muted" locale={Fider.currentLocale} date={props.post.createdAt} />+ </VStack>+ </HStack>)}- </HStack>+ </VStack>- <div className="flex-grow">- {this.state.editMode ? (- <Form error={this.state.error}>- <Input field="title" maxLength={100} value={this.state.newTitle} onChange={this.setNewTitle} />- </Form>- ) : (- <>- <h1 className="text-large">{this.props.post.title}</h1>- </>- )}- </div>+ {!editMode && (+ <Dropdown position="left" renderHandle={<Icon sprite={IconDotsHorizontal} width="24" height="24" />}>+ <Dropdown.ListItem onClick={onActionSelected("copy")}>+ <Trans id="action.copylink">Copy link</Trans>+ </Dropdown.ListItem>+ {Fider.session.isAuthenticated && canEditPost(Fider.session.user, props.post) && (+ <>+ <Dropdown.ListItem onClick={onActionSelected("edit")}>+ <Trans id="action.edit">Edit</Trans>+ </Dropdown.ListItem>+ {Fider.session.user.isCollaborator && (+ <Dropdown.ListItem onClick={onActionSelected("status")}>+ <Trans id="action.respond">Respond</Trans>+ </Dropdown.ListItem>+ )}+ </>+ )}+ {canDeletePost() && (+ <Dropdown.ListItem onClick={onActionSelected("delete")} className="text-red-700">+ <Trans id="action.delete">Delete</Trans>+ </Dropdown.ListItem>+ )}+ </Dropdown>+ )}+ </HStack>- <DeletePostModal onModalClose={() => this.setShowDeleteModal(false)} showModal={this.state.showDeleteModal} post={this.props.post} />- {Fider.session.isAuthenticated && Fider.session.user.isCollaborator && (- <ResponseModal onCloseModal={() => this.setShowResponseModal(false)} showModal={this.state.showResponseModal} post={this.props.post} />+ <div className="flex-grow">+ {editMode ? (+ <Form error={error}>+ <Input field="title" maxLength={100} value={newTitle} onChange={setNewTitle} />+ </Form>+ ) : (+ <>+ <h1 className="text-large">{props.post.title}</h1>+ </>)}- <VStack>- {this.state.editMode ? (- <Form error={this.state.error}>- <TextArea field="description" value={this.state.newDescription} onChange={this.setNewDescription} />- <MultiImageUploader field="attachments" bkeys={this.props.attachments} maxUploads={3} onChange={this.setAttachments} />- </Form>- ) : (- <>- {this.props.post.description && <Markdown className="description" text={this.props.post.description} style="full" />}- {!this.props.post.description && (- <em className="text-muted">- <Trans id="showpost.message.nodescription">No description provided.</Trans>- </em>- )}- {this.props.attachments.map((x) => (- <ImageViewer key={x} bkey={x} />- ))}- </>- )}- </VStack>- <div className="mt-2">- <TagsPanel post={this.props.post} tags={this.props.tags} />- </div>+ </div>- <VStack spacing={4}>- {!this.state.editMode ? (- <HStack justify="between" align="start">- <VoteSection post={this.props.post} votes={this.props.post.votesCount} />- <FollowButton post={this.props.post} subscribed={this.props.subscribed} />- </HStack>- ) : (- <HStack>- <Button variant="primary" onClick={this.saveChanges} disabled={Fider.isReadOnly}>- <Icon sprite={IconThumbsUp} />{" "}- <span>- <Trans id="action.save">Save</Trans>- </span>- </Button>- <Button onClick={this.cancelEdit} disabled={Fider.isReadOnly}>- <Icon sprite={IconX} />- <span>- <Trans id="action.cancel">Cancel</Trans>- </span>- </Button>- </HStack>- )}- <div className="border-4 border-blue-500" />- </VStack>+ <DeletePostModal onModalClose={() => setShowDeleteModal(false)} showModal={showDeleteModal} post={props.post} />+ {Fider.session.isAuthenticated && Fider.session.user.isCollaborator && (+ <ResponseModal onCloseModal={() => setShowResponseModal(false)} showModal={showResponseModal} post={props.post} />+ )}+ <VStack>+ {editMode ? (+ <Form error={error}>+ <TextArea field="description" value={newDescription} onChange={setNewDescription} />+ <MultiImageUploader field="attachments" bkeys={props.attachments} maxUploads={3} onChange={setAttachments} />+ </Form>+ ) : (+ <>+ {props.post.description && <Markdown className="description" text={props.post.description} style="full" />}+ {!props.post.description && (+ <em className="text-muted">+ <Trans id="showpost.message.nodescription">No description provided.</Trans>+ </em>+ )}+ {props.attachments.map((x) => (+ <ImageViewer key={x} bkey={x} />+ ))}+ </>+ )}+ </VStack>+ <div className="mt-2">+ <TagsPanel post={props.post} tags={props.tags} />+ </div>- <ResponseDetails status={this.props.post.status} response={this.props.post.response} />+ <VStack spacing={4}>+ {!editMode ? (+ <HStack justify="between" align="start">+ <VoteSection post={props.post} votes={props.post.votesCount} />+ <FollowButton post={props.post} subscribed={props.subscribed} />+ </HStack>+ ) : (+ <HStack>+ <Button variant="primary" onClick={saveChanges} disabled={Fider.isReadOnly}>+ <Icon sprite={IconThumbsUp} />{" "}+ <span>+ <Trans id="action.save">Save</Trans>+ </span>+ </Button>+ <Button onClick={cancelEdit} disabled={Fider.isReadOnly}>+ <Icon sprite={IconX} />+ <span>+ <Trans id="action.cancel">Cancel</Trans>+ </span>+ </Button>+ </HStack>+ )}+ <div className="border-4 border-blue-500" /></VStack>- </div>- <div className="p-show-post__discussion_col">- <DiscussionPanel post={this.props.post} comments={this.props.comments} highlightedComment={this.state.highlightedComment} />- </div>+ <ResponseDetails status={props.post.status} response={props.post.response} />+ </VStack></div>- <div className="p-show-post__action-col">- <VotesPanel post={this.props.post} votes={this.props.votes} />- <PoweredByFider slot="show-post" className="mt-3" />++ <div className="p-show-post__discussion_col">+ <DiscussionPanel post={props.post} comments={props.comments} highlightedComment={highlightedComment} /></div></div>+ <div className="p-show-post__action-col">+ <VotesPanel post={props.post} votes={props.votes} />+ <PoweredByFider slot="show-post" className="mt-3" />+ </div></div>- </>- )- }+ </div>+ </>+ )}diff --git a/views/base.html b/views/base.htmlindex d7c76f4dd..74f34859e 100644--- a/views/base.html+++ b/views/base.html@@ -51,20 +51,26 @@<script type="text/javascript" nonce="{{ .public.contextID }}">;(function () {- const params = new URLSearchParams(window.location.search)- let theme = "light"- if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {- theme = params.get("theme")- localStorage.setItem("theme", theme)- params.delete("theme")- const newUrl = `${window.location.pathname}?${params.toString()}`- window.history.replaceState({}, "", newUrl)- } else {- theme = localStorage.getItem("theme") || "light"- }+ try {+ if (typeof window !== 'undefined' && window.localStorage) {+ const params = new URLSearchParams(window.location.search)+ let theme = "light"+ if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {+ theme = params.get("theme")+ localStorage.setItem("theme", theme)+ params.delete("theme")+ const newUrl = `${window.location.pathname}?${params.toString()}`+ window.history.replaceState({}, "", newUrl)+ } else {+ theme = localStorage.getItem("theme") || "light"+ }- if (theme == "light" || theme == "dark") {- document.body.setAttribute("data-theme", theme)+ if (theme == "light" || theme == "dark") {+ document.body.setAttribute("data-theme", theme)+ }+ }+ } catch (e) {+ document.body.setAttribute("data-theme", "light")}})()</script>