Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace text angular editor with trix editor in About Us and Shopfront message fields #12734

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/locales/ar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3325,6 +3325,8 @@ ar:
كانت هناك مشكلة في إعداد بطاقتك في بوابة المدفوعات الخاصة بنا.
يرجى تحديث الصفحة والمحاولة مرة أخرى ، إذا فشلت مرة أخرى ،
يرجى الاتصال بنا للحصول على الدعم.
trix:
urlPlaceholder: "الرجاء إدخال عنوان URL لإدراجه"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I just meant to update it in en.yml. In general we should avoid changing other locale files directly. I'm unsure if adding new keys is a problem though.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mkllnk can you help with a query here?
For convenience, Cillian has copied an existing translation to a new key (the existing translation was for angular editor, and there is an equivalent in the new trix editor). Do you know if it's ok, and if it's helpful to add new keys to the locale files?
Or should we remove this before merging?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remove this addition. Transifex will handle it. It recognises existing translations.

inflections:
each:
zero: "كل"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/ca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3304,6 +3304,8 @@ ca:
stripe_elements:
unknown_error_from_stripe: |
Hi ha hagut un problema al configurar la vostra targeta a la nostra passarel·la de pagaments. Actualitzeu la pàgina i torneu-ho a provar; si falla una segona vegada, poseu-vos en contacte amb nosaltres per obtenir assistència.
trix:
urlPlaceholder: "Introduïu un URL per inserir"
inflections:
each:
one: "cadascun"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/cy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3487,6 +3487,8 @@ cy:
Roedd problem wrth sefydlu eich cerdyn yn y porth talu.
Gofynnir ichi ddiweddaru'r dudalen a rhoi cynnig arall, os bydd yn methu'r ail dro,
cysylltwch â ni am gymorth.
trix:
urlPlaceholder: "Noder URL i'w fewnosod"
inflections:
each:
one: "yr un"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/de_CH.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3234,6 +3234,8 @@ de_CH:
unknown_error_from_stripe: |
Beim Einrichten Ihrer Kreditkarte in unserem Zahlungsgateway ist ein Problem aufgetreten.
Bitte laden Sie die Seite neu und versuchen Sie es erneut. Wenn dies ein zweites Mal fehlschlägt, kontaktieren Sie uns bitte, um Unterstützung zu erhalten.
trix:
urlPlaceholder: "Bitte geben Sie die einzufügende URL ein:"
inflections:
each:
one: "jeder"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/de_DE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3474,6 +3474,8 @@ de_DE:
unknown_error_from_stripe: |
Beim Einrichten Ihrer Kreditkarte in unserem Zahlungsgateway ist ein Problem aufgetreten.
Bitte laden Sie die Seite neu und versuchen Sie es erneut. Wenn dies ein zweites Mal fehlschlägt, kontaktieren Sie uns bitte, um Unterstützung zu erhalten.
trix:
urlPlaceholder: "Bitte geben Sie die einzufügende URL ein:"
inflections:
each:
one: "jeder"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/el.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3537,6 +3537,8 @@ el:
Παρουσιάστηκε πρόβλημα κατά τη ρύθμιση της κάρτας σας στην πύλη πληρωμών μας.
Παρακαλώ ανανεώστε τη σελίδα και δοκιμάστε ξανά. Εάν αποτύχει και τη δεύτερη φορά,
παρακαλώ επικοινωνήστε μαζί μας για υποστήριξη.
trix:
urlPlaceholder: "Εισαγάγετε μια διεύθυνση URL για εισαγωγή"
inflections:
each:
one: "καθε"
Expand Down
2 changes: 1 addition & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3744,7 +3744,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
undo: "Undo"
unlink: "Unlink"
url: "URL"
urlPlaceholder: "Enter a URL"
urlPlaceholder: "Please enter a URL to insert"
GB: "GB"
KB: "KB"
MB: "MB"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3277,6 +3277,8 @@ es:
stripe_elements:
unknown_error_from_stripe: |
Hubo un problema al configurar su tarjeta en nuestra pasarela de pagos. Actualice la página y vuelva a intentarlo; si falla por segunda vez, comuníquese con nosotros para obtener asistencia.
trix:
urlPlaceholder: "Por favor introduzca una URL para insertar"
inflections:
each:
one: "each"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/es_CO.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2910,6 +2910,8 @@ es_CO:
unknown_error_from_stripe: |
Hubo un problema al configurar su tarjeta en nuestra pasarela de pagos.
Por favor actualice la página y vuelva a intentarlo; si falla por segunda vez, por favor contáctanos para recibir asistencia.
trix:
urlPlaceholder: "Por favor introduzca una URL para insertar"
inflections:
each:
one: "each"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/es_CR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3234,6 +3234,8 @@ es_CR:
Hubo un problema al configurar su tarjeta en nuestra pasarela de pagos.
Actualice la página y vuelva a intentarlo, si falla por segunda vez,
por favor contáctenos para soporte.
trix:
urlPlaceholder: "Por favor introduzca una URL para insertar"
inflections:
each:
one: "each"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/es_US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3099,6 +3099,8 @@ es_US:
stripe_elements:
unknown_error_from_stripe: |
Hubo un problema al configurar su tarjeta en nuestra pasarela de pagos. Actualice la página y vuelva a intentarlo; si falla por segunda vez, comuníquese con nosotros para obtener asistencia.
trix:
urlPlaceholder: "Por favor introduzca una URL para insertar"
inflections:
each:
one: "each"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/fil_PH.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2847,6 +2847,8 @@ fil_PH:
signup_or_login: "magsimula sa pamamagitan ng pag-sign-up (o pag-log-in)"
have_an_account: "Mayroon ka na bang account?"
action_login: "Maglog-in na ngayon."
trix:
urlPlaceholder: "ipasok ang URL na ilalagay"
inflections:
each:
one: "bawat"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3606,6 +3606,8 @@ fr:
Il a eu un problème lors de la prise en compte de votre carte.
Merci de rafraîchir la page. Si cela ne fonctionne pas une seconde fois,
merci de nous contacter.
trix:
urlPlaceholder: "Veuillez entrer l'URL à insérer"
inflections:
each:
one: "chacun"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/fr_BE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3336,6 +3336,8 @@ fr_BE:
signup_or_login: "Commencez par vous inscrire (ou connexion)"
have_an_account: "Déjà inscrit?"
action_login: "Se connecter."
trix:
urlPlaceholder: "Entrer l'URL pour insérer"
inflections:
item:
one: "article"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/fr_CA.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3573,6 +3573,8 @@ fr_CA:
Il a eu un problème lors de la prise en compte de votre carte.
Merci de rafraîchir la page. Si cela ne fonctionne pas une seconde fois,
merci de nous contacter.
trix:
urlPlaceholder: "Veuillez entrer l'URL à insérer"
inflections:
each:
one: "chacun"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/fr_CH.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3239,6 +3239,8 @@ fr_CH:
Il a eu un problème lors de la prise en compte de votre carte.
Merci de rafraîchir la page. Si cela ne fonctionne pas une seconde fois,
merci de nous contacter.
trix:
urlPlaceholder: "Veuillez entrer l'URL à insérer"
inflections:
each:
one: "chacun"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/fr_CM.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3133,6 +3133,8 @@ fr_CM:
Il a eu un problème lors de la prise en compte de votre carte.
Merci de rafraîchir la page. Si cela ne fonctionne pas une seconde fois,
merci de nous contacter.
trix:
urlPlaceholder: "Veuillez entrer l'URL à insérer"
inflections:
each:
one: "chacun"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/hi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3459,6 +3459,8 @@ hi:
हमारे भुगतान गेटवे में आपके कार्ड को सेट करने में समस्या हुई।
कृपया पेज को रिफ्रेश करें और फिर से कोशिश करें, अगर यह दूसरी बार विफल हो जाता है, तो
कृपया समर्थन के लिए हमसे संपर्क करें।
trix:
urlPlaceholder: "कृपया डालने के लिए URL डालें"
inflections:
each:
one: "हर एक"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/hu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3572,6 +3572,8 @@ hu:
Hiba történt a kártya beállításakor.
Kérjük, frissítsd az oldalt, és próbáld újra. Ha másodszorra sem sikerül
kérjük, fordulj hozzánk támogatásért.
trix:
urlPlaceholder: "Kérünk, adj meg egy URL-t"
inflections:
each:
one: "mindegyik"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3308,6 +3308,8 @@ it:
C'è stato un problema nell'impostare la tua carta nel nostro portale di pagamento.
Per favore aggiorna la pagina e prova ancora, se dovesse ripresentarsi l'errore,
contattaci per avere supporto.
trix:
urlPlaceholder: "Per favore inserisci un URL"
inflections:
each:
one: "ogni"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/it_CH.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3168,6 +3168,8 @@ it_CH:
C'è stato un problema nell'impostare la tua carta nel nostro portale di pagamento.
Per favore aggiorna la pagina e prova ancora, se dovesse ripresentarsi l'errore,
contattaci per avere supporto.
trix:
urlPlaceholder: "Per favore inserisci un URL"
inflections:
each:
one: "ogni"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/ko.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3182,6 +3182,8 @@ ko:
결제 게이트웨이에서 카드를 설정하는 동안 문제가 발생했습니다.
페이지를 새로 고친 후 다시 시도하십시오. 만약 다시 실패하신면,
저희에게 지원을 요청해주세요.
trix:
urlPlaceholder: "삽입할 URL을 입력하십시오."
inflections:
each:
other: "각"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/ml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3483,6 +3483,8 @@ ml:
ഞങ്ങളുടെ പേയ്‌മെന്റ് ഗേറ്റ്‌വേയിൽ നിങ്ങളുടെ കാർഡ് സജ്ജീകരിക്കുന്നതിൽ ഒരു തകരാറുണ്ടായി.
പേജ് പുതുക്കിയ ശേഷം വീണ്ടും ശ്രമിക്കുക, ഇത് രണ്ടാം തവണയും പരാജയപ്പെടുകയാണെങ്കിൽ,
പിന്തുണയ്ക്കായി ഞങ്ങളെ ബന്ധപ്പെടുക.
trix:
urlPlaceholder: "ചേർക്കുന്നതിന് ദയവായി ഒരു യുആർഎൽ നൽകുക"
inflections:
each:
one: "ഓരോന്നും"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/mr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3383,6 +3383,8 @@ mr:
आमच्या पेमेंट गेटवेमध्ये तुमचे कार्ड सेट करताना समस्या आली.
कृपया पृष्ठ रीफ्रेश करा आणि पुन्हा प्रयत्न करा, जर ते दुसऱ्यांदा अयशस्वी झाले,
कृपया मदतीसाठी आमच्याशी संपर्क साधा.
trix:
urlPlaceholder: "कृपया URL प्रविष्ट करा"
inflections:
each:
one: "प्रत्येक"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/nb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3570,6 +3570,8 @@ nb:
stripe_elements:
unknown_error_from_stripe: |
Det oppsto et problem med å konfigurere kortet ditt i betalingsportalen vår. Oppdater siden og prøv igjen. Hvis den mislykkes en gang til, kan du kontakte oss for support.
trix:
urlPlaceholder: "Vennligst skriv inn en URL for å sette inn"
inflections:
each:
one: "Hver"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/nl_BE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2905,6 +2905,8 @@ nl_BE:
signup_or_login: "Start door te registreren (of in te loggen)"
have_an_account: "Heb je al een account?"
action_login: "Log nu in."
trix:
urlPlaceholder: "Voer een URL in om in te voegen"
producers:
signup:
start_free_profile: "Eerst uw bedrijfsprofiel maken en wijzig de formule als U klaar bent !"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/pa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3426,6 +3426,8 @@ pa:
stripe_elements:
unknown_error_from_stripe: |
ਸਾਡੇ ਭੁਗਤਾਨ ਗੇਟਵੇ ਵਿੱਚ ਤੁਹਾਡੇ ਕਾਰਡ ਨੂੰ ਸੇਟ ਕਰਨ ਵਿੱਚ ਇੱਕ ਸਮੱਸਿਆ ਆਈ ਸੀ। ਕਿਰਪਾ ਕਰਕੇ ਪੇਜ ਨੂੰ ਤਾਜ਼ਾ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ, ਜੇਕਰ ਇਹ ਦੂਜੀ ਵਾਰ ਅਸਫਲ ਹੁੰਦਾ ਹੈ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ ਮਦਦ ਲਈ ਸਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।
trix:
urlPlaceholder: "ਸਮਿਲਿਤ ਕਰਨ ਲਈ ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ URL ਦਾਖਲ ਕਰੋ"
producers:
signup:
start_free_profile: "ਇੱਕ ਮੁਫ਼ਤ ਪ੍ਰੋਫਾਈਲ ਨਾਲ ਸ਼ੁਰੂ ਕਰੋ, ਅਤੇ ਜਦੋਂ ਤੁਸੀਂ ਤਿਆਰ ਹੋਵੋ ਤਾਂ ਵਿਸਤਾਰ ਕਰੋ!"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/pl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2771,6 +2771,8 @@ pl:
stripe_elements:
unknown_error_from_stripe: |
Wystąpił problem z konfiguracją Twojej karty w naszej bramce płatności. Odśwież stronę i spróbuj ponownie, jeśli to się nie powiedzie po raz drugi, skontaktuj się z nami, aby uzyskać pomoc.
trix:
urlPlaceholder: "Wprowadź adres URL do wstawienia"
inflections:
each:
one: "każdy"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/pt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2881,6 +2881,8 @@ pt:
signup_or_login: "Comece por fazer login ou registar-se"
have_an_account: "Já possui uma conta?"
action_login: "Entrar agora."
trix:
urlPlaceholder: "Por favor insira um URL"
inflections:
packet:
one: "pacote"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/pt_BR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3034,6 +3034,8 @@ pt_BR:
Houve um problema ao configurar seu cartão no nosso serviço de pagamento.
Favor recarregar a página e tentar novamente. Se não funcionar,
por favor entre em contato com o nosso suporte.
trix:
urlPlaceholder: "Digite um URL para inserir"
inflections:
each:
one: "cada"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/ru.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3538,6 +3538,8 @@ ru:
При настройке вашей карты в нашем платежном шлюзе возникла проблема.
Обновите страницу и попробуйте еще раз, если это не удастся второй раз,
свяжитесь с нами для получения поддержки.
trix:
urlPlaceholder: "Пожалуйста, введите URL для вставки"
inflections:
each:
one: "каждый"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/tr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3049,6 +3049,8 @@ tr:
unknown_error_from_stripe: |
Ödeme sağlayıcımızda kart ayarlarınız ile ilgili bir sorun oluştu.
Lütfen sayfayı yenileyip tekrar deneyin, eğer sorun devam ediyorsa lütfen destek için bize ulaşın.
trix:
urlPlaceholder: "Lütfen eklemek için bir URL girin"
inflections:
each:
one: "her biri"
Expand Down
2 changes: 2 additions & 0 deletions config/locales/uk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3227,6 +3227,8 @@ uk:
stripe_elements:
unknown_error_from_stripe: |
Під час налаштування вашої картки в нашому платіжному шлюзі виникла проблема. Будь ласка, оновіть сторінку та повторіть спробу, якщо це не вдасться вдруге, будь ласка, зв’яжіться з нами для підтримки.
trix:
urlPlaceholder: "Введіть URL-адресу для вставки"
inflections:
each:
one: "кожен"
Expand Down