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

Upstream 20241216 #953

Merged
merged 73 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
ca45f89
Fix various visual sign-up flow issues (#33206)
Gargron Dec 9, 2024
796dd57
Change ability to navigate of unconfirmed users (#33209)
Gargron Dec 9, 2024
ab133c5
Bump version to v4.3.2 (#33226)
ClearlyClaire Dec 9, 2024
bf79174
Fix design of search bar on explore screen in light theme in web UI (…
Gargron Dec 9, 2024
f646fb0
Update dependency doorkeeper to v5.8.1 (#33225)
renovate[bot] Dec 9, 2024
7a2a345
New Crowdin Translations (automated) (#33210)
github-actions[bot] Dec 9, 2024
30aa0df
Add terms of service (#33055)
Gargron Dec 9, 2024
7b7a298
Update devDependencies (non-major) (#33221)
renovate[bot] Dec 9, 2024
6615f17
Fix missing top border on Admin Hashtags UI (#31443)
ThisIsMissEm Dec 9, 2024
342055c
Update `rubocop` to version 1.69.1 (#32967)
mjankowski Dec 9, 2024
cfd2879
Update dependency nokogiri to v1.17.0 (#33218)
renovate[bot] Dec 9, 2024
2e35b15
Update dependency react-textarea-autosize to v8.5.6 (#33228)
renovate[bot] Dec 9, 2024
425311e
Change referrer policy to be controlled by header in web UI (#33214)
Gargron Dec 9, 2024
12d9ef6
Character conversion on TOS template (#33233)
mjankowski Dec 10, 2024
2131e61
Fix hard wrap of markdown list in TOS template (#33230)
mjankowski Dec 10, 2024
c8c916e
Change URL truncation to account for ellipses (#33229)
FND Dec 10, 2024
801cd73
New Crowdin Translations (automated) (#33235)
github-actions[bot] Dec 10, 2024
58c5068
Fix Chromium showing scrollbar on embedded posts (#33237)
ClearlyClaire Dec 10, 2024
7d52b24
Add coverage for `AccountPin` model (#33231)
mjankowski Dec 10, 2024
2a369a8
Use a system setting for the Referer policy (#33239)
renchap Dec 10, 2024
c72083a
Add system spec for TOS page (#33243)
mjankowski Dec 10, 2024
19c6cb8
Add coverage for `Admin::DistributeTermsOfServiceNotificationWorker` …
mjankowski Dec 10, 2024
66266ec
Add coverage for `UserMailer#terms_of_service_changed` mailer (#33242)
mjankowski Dec 10, 2024
12eb6b0
Add coverage for `TermsOfServicePolicy` class (#33241)
mjankowski Dec 10, 2024
3222c19
Update dependency nokogiri to v1.17.1 (#33246)
renovate[bot] Dec 10, 2024
e76aff7
Standardize uniqueness validation declaration on `Mention` (#33247)
mjankowski Dec 10, 2024
e4e35ab
Add NOT NULL requirement to account columns on `AccountPin` (#33244)
mjankowski Dec 10, 2024
ded799f
Convert polls to Typescript / Immutable Records (#29789)
renchap Dec 10, 2024
094e217
Add system spec for `Admin::TermsOfService` index view (#33250)
mjankowski Dec 10, 2024
3936434
Add coverage for admin/terms/drafts#update and admin/terms/generates#…
mjankowski Dec 10, 2024
a70ae28
Support animated PNGs in media attachments (#28516)
c960657 Dec 11, 2024
9ba4c8e
Handle rotation is not present in the video metadata (#33261)
tribela Dec 11, 2024
bf4ad7e
Update dependency rails to v7.2.2.1 (#33259)
renovate[bot] Dec 11, 2024
5e4ca08
Update dependency @rails/ujs to v7.1.501 (#33258)
renovate[bot] Dec 11, 2024
32e23ef
Update dependency react-redux to v9.2.0 (#33260)
renovate[bot] Dec 11, 2024
f12b3a9
New Crowdin Translations (automated) (#33262)
github-actions[bot] Dec 11, 2024
f6daf73
Add non-matching cases to `Report#history` spec (#33253)
mjankowski Dec 11, 2024
f721e76
Avoid double request in `admin/export_domain_allows` controller spec …
mjankowski Dec 11, 2024
ad68686
Simplify model validation specs for `CustomFilter` (#33248)
mjankowski Dec 11, 2024
3614e9a
Fix Vagrant failure to sync dangling symlinks (#28101)
filippog Dec 11, 2024
a4560d9
Change label of grouped favourite notification on private mentions (#…
ClearlyClaire Dec 11, 2024
da279df
Fix voting on polls (#33266)
renchap Dec 11, 2024
bcb3b62
Fix processing of mentions for post edits with an existing correspond…
ClearlyClaire Dec 11, 2024
d6241f6
Fix `Rails/ThreeStateBooleanColumn` cop (#33269)
mjankowski Dec 11, 2024
315c170
Fix bug where remote suspension causes local instance to remove remot…
ShadowJonathan Dec 11, 2024
43702b9
Enable `Rails/ReversibleMigration` cop (#33264)
mjankowski Dec 11, 2024
8fa89c2
Remove `app/views` rubocop rule exception for haml-lint (#33270)
mjankowski Dec 11, 2024
6445fac
Update dependency react-select to v5.9.0 (#33279)
renovate[bot] Dec 12, 2024
d56aa90
Disable `Naming/VariableNumber` cop in old migrations (#33274)
mjankowski Dec 12, 2024
b51e0bc
Simplify model validation specs for `Report` (#33267)
mjankowski Dec 12, 2024
e0a49af
New Crowdin Translations (automated) (#33280)
github-actions[bot] Dec 12, 2024
4bf6af3
Remove unused `model_have_error_on_field` matcher (#33273)
mjankowski Dec 12, 2024
708919e
Update deprecated `enum` style in older migrations (#32925)
mjankowski Dec 12, 2024
0636bcd
Change search to use query params in web UI (#32949)
Gargron Dec 12, 2024
bc5b9d9
Remove unused `admin/terms_of_service` routes (#33288)
mjankowski Dec 12, 2024
42f6a36
Run optimize PNG on emoji sheet asset (#33281)
mjankowski Dec 12, 2024
d580607
don't start OTel traces with Redis spans (#33090)
robbkidd Dec 13, 2024
234af14
Fix long account username leaving container (#33286)
mjankowski Dec 13, 2024
3c71ee9
Use `touch_all` for time column updates (#33295)
mjankowski Dec 13, 2024
ed33064
Update dependency sass to v1.83.0 (#33299)
renovate[bot] Dec 13, 2024
e2c7462
Update dependency dotenv to v3.1.5 (#33298)
renovate[bot] Dec 13, 2024
148b1ff
Update dependency nokogiri to v1.17.2 (#33294)
renovate[bot] Dec 13, 2024
4f2d060
Update dependency aws-sdk-s3 to v1.176.1 (#33293)
renovate[bot] Dec 13, 2024
1bd9306
Add coverage for `Tag` model validations on name/display_name (#33291)
mjankowski Dec 13, 2024
03aa095
Update RuboCop (non-major) to v1.69.2 (#33283)
renovate[bot] Dec 13, 2024
92a4423
Update dependency irb to v1.14.2 (#33282)
renovate[bot] Dec 13, 2024
7200f9d
New Crowdin Translations (automated) (#33300)
github-actions[bot] Dec 13, 2024
4130bda
Convert `settings/verifications` controller spec to system spec (#33285)
mjankowski Dec 13, 2024
efc85e3
Add missing `NOT NULL` requirement to small, indexed, valid data tabl…
mjankowski Dec 14, 2024
a8edc82
Replace deprecated "github" format for stylelint on CI runs (#33292)
mjankowski Dec 14, 2024
5cf3724
Ensure datetime/date are serialized to correct format (#33086)
nikclayton Dec 14, 2024
3784ad2
Merge remote-tracking branch 'parent/main' into upstream-20241216
kmycode Dec 16, 2024
ddd3581
Fix test
kmycode Dec 16, 2024
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
Next Next commit
Fix various visual sign-up flow issues (mastodon#33206)
  • Loading branch information
Gargron authored Dec 9, 2024
commit ca45f896dd3d967521884d42b92d1a4844e16016
8 changes: 8 additions & 0 deletions app/controllers/auth/registrations_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,12 @@ def require_rules_acceptance!
def set_cache_headers
response.cache_control.replace(private: true, no_store: true)
end

def is_flashing_format? # rubocop:disable Naming/PredicateName
if params[:action] == 'create'
false # Disable flash messages for sign-up
else
super
end
end
end
6 changes: 6 additions & 0 deletions app/javascript/styles/mastodon-light/diff.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@

.simple_form .button.button-tertiary {
color: $highlight-text-color;

&:hover,
&:focus,
&:active {
color: $white;
}
}

.status-card__actions button,
Expand Down
5 changes: 4 additions & 1 deletion app/javascript/styles/mastodon/about.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ $fluid-breakpoint: $maximum-width + 20px;
.rules-list {
font-size: 15px;
line-height: 22px;
color: $primary-text-color;
counter-reset: list-counter;

li {
Expand Down Expand Up @@ -82,6 +81,10 @@ $fluid-breakpoint: $maximum-width + 20px;
}
}

&__text {
color: $primary-text-color;
}

&__hint {
font-size: 14px;
font-weight: 400;
Expand Down
10 changes: 5 additions & 5 deletions app/javascript/styles/mastodon/components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@

&:disabled,
&.disabled {
background-color: $ui-primary-color;
background-color: $ui-button-disabled-color;
cursor: not-allowed;
}

Expand Down Expand Up @@ -148,14 +148,14 @@
&:disabled,
&.disabled {
opacity: 0.7;
border-color: $ui-primary-color;
color: $ui-primary-color;
border-color: $ui-button-disabled-color;
color: $ui-button-disabled-color;

&:active,
&:focus,
&:hover {
border-color: $ui-primary-color;
color: $ui-primary-color;
border-color: $ui-button-disabled-color;
color: $ui-button-disabled-color;
}
}
}
Expand Down
14 changes: 3 additions & 11 deletions app/javascript/styles/mastodon/forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -584,8 +584,9 @@ code {
background-color: $ui-button-focus-background-color;
}

&:disabled,
&:disabled:hover {
background-color: $ui-primary-color;
background-color: $ui-button-disabled-color;
}

&.negative {
Expand All @@ -599,16 +600,6 @@ code {
}
}

.button.button-tertiary {
padding: 9px;

&:hover,
&:focus,
&:active {
padding: 10px;
}
}

select {
appearance: none;
box-sizing: border-box;
Expand Down Expand Up @@ -1173,6 +1164,7 @@ code {
align-items: center;
padding-bottom: 30px;
margin-bottom: 30px;
color: $white;

li {
flex: 0 0 auto;
Expand Down
7 changes: 7 additions & 0 deletions app/javascript/styles/mastodon/variables.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'sass:color';

// Commonly used web colors
$black: #000000; // Black
$white: #ffffff; // White
Expand Down Expand Up @@ -46,6 +48,11 @@ $ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;

$ui-button-disabled-color: color.adjust(
$ui-button-background-color,
$alpha: -0.3
) !default;

$ui-button-secondary-color: $blurple-500 !default;
$ui-button-secondary-border-color: $blurple-500 !default;
$ui-button-secondary-focus-border-color: $blurple-300 !default;
Expand Down
4 changes: 2 additions & 2 deletions app/views/auth/registrations/new.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
required: true
= f.input :password_confirmation,
hint: false,
input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_password'), autocomplete: 'new-password' },
input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_password'), autocomplete: 'new-password', maxlength: User.password_length.last },
placeholder: t('simple_form.labels.defaults.confirm_password'),
required: true
= f.input :confirm_password,
Expand Down Expand Up @@ -73,7 +73,7 @@
= f.input :agreement,
as: :boolean,
label: t('auth.privacy_policy_agreement_html', rules_path: about_more_path, privacy_policy_path: privacy_policy_path),
required: true,
required: false,
wrapper: :with_label

.actions
Expand Down
5 changes: 0 additions & 5 deletions config/locales/devise.an.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,6 @@ an:
updated_not_active: La tuya clau s'ha cambiau con exito.
registrations:
destroyed: Dica unatra! La tuya cuenta ha estau cancelada con exito. Asperamos veyer-te de nuevo luego.
signed_up: Bienveniu! T'has rechistrau correctament.
signed_up_but_inactive: T'has rechistrau con exito. Manimenos, no s'ha puesto iniciar sesión perque la tuya cuenta encara no ye activada.
signed_up_but_locked: T'has rechistrau con exito. Manimenos, no s'ha puesto iniciar sesión perque la tuya cuenta ye blocada.
signed_up_but_pending: Un mensache con un vinclo de confirmación ha estau ninviau a la tuya adreza de correu electronico. Dimpués de fer clic en o vinclo, revisaremos la tuya solicitut. Serás notificau si s'apreba.
signed_up_but_unconfirmed: Un mensache con un vinclo de confirmación ha estau ninviau a la tuya adreza de correu electronico. Per favor, sigue lo vinclo pa activar la tuya cuenta. Per favor, compreba la tuya carpeta de correu no deseyau si no recibes dito correu electronico.
update_needs_confirmation: Has actualizau la tuya cuenta con exito, pero amenestemos verificar la tuya nueva adreza de correu electronico. Per favor, compreba lo tuyo correu electronico y sigue lo vinclo de confirmación pa confirmar la tuya nueva adreza de correu electronico. Per favor, compreba la tuya carpeta de correu no deseyau si no recibes dito correu electronico.
updated: La tuya cuenta s'ha actualizau con exito.
sessions:
Expand Down
5 changes: 0 additions & 5 deletions config/locales/devise.ar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@ ar:
updated_not_active: تم تغيير كلمة المرور بنجاح.
registrations:
destroyed: إلى اللقاء! لقد تم إلغاء حسابك. نتمنى أن نراك مجددا.
signed_up: أهلا وسهلا! تم تسجيل دخولك بنجاح.
signed_up_but_inactive: لقد تمت عملية إنشاء حسابك بنجاح إلاّ أنه لا يمكننا تسجيل دخولك إلاّ بعد قيامك بتفعيله.
signed_up_but_locked: لقد تم تسجيل حسابك بنجاح إلّا أنه لا يمكنك تسجيل الدخول لأن حسابك مجمد.
signed_up_but_pending: لقد تم إرسال رسالة تحتوي على رابط للتفعيل إلى عنوان بريدك الإلكتروني. بالضغط على الرابط سوف نقوم بمراجعة طلبك. سنقوم بإشعارك إن حظيت بالموافقة.
signed_up_but_unconfirmed: لقد تم إرسال رسالة تحتوي على رابط للتفعيل إلى عنوان بريدك الإلكتروني. بالضغط على الرابط سوف يتم تفعيل حسابك. لذا يُرجى إلقاء نظرة على ملف الرسائل غير المرغوب فيها إنْ لم تَعثُر على الرسالة السالفة الذِكر.
update_needs_confirmation: لقد قمت بتحديث حسابك بنجاح إلا أنه يجب علينا التأكد من صحة عنوان بريدك الإلكتروني الجديد. يرجى الإطلاع على بريدك و اتباع الرابط الذي تلقيتَه لتأكيد عنوان بريدك الإلكتروني الجديد. إن لم تتلقى تلك الرسالة ، ندعوك إلى تفقُّد مجلد البريد المزعج.
updated: تم تحديث حسابك بنجاح.
sessions:
Expand Down
5 changes: 0 additions & 5 deletions config/locales/devise.ast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ ast:
updated_not_active: La contraseña camudó correutamente.
registrations:
destroyed: "¡Ta llueu! La cuenta anulóse correutamente. Esperamos volver vete pronto."
signed_up: "¡Afáyate! Rexistréstite correutamente."
signed_up_but_inactive: Rexistréstite correutamente. Por embargu, nun se pudo aniciar la sesión porque la cuenta entá nun s'activó.
signed_up_but_locked: Rexistréstite correutamente. Por embargu, nun se pudo aniciar la sesión porque la cuenta ta bloquiada.
signed_up_but_pending: Unvióse un mensaxe a la direición de corréu electrónicu que contién un enllaz de confirmación. Darréu de calcar nel enllaz, vamos revisar la solicitú y si s'aprueba, avisámoste.
signed_up_but_unconfirmed: Unvióse un mensaxe de confirmación a la to direición de corréu electrónicu. Sigui l'enllaz p'activar la cuenta y revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
update_needs_confirmation: Anovesti la cuenta correutamente, mas tenemos de verificar la direición de corréu electrónicu nueva. Revisa'l to corréu electrónicu y sigui l'enllaz de confirmación pa confirmar esta direición. Si nun recibiesti'l mensaxe, revisa la carpeta Puxarra.
updated: La cuenta anovóse correutamente.
sessions:
Expand Down
5 changes: 0 additions & 5 deletions config/locales/devise.be.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@ be:
updated_not_active: Ваш пароль быў паспяхова зменены.
registrations:
destroyed: Пакуль! Ваш уліковы запіс быў паспяхова выдалены. Мы спадзяваемся хутка ўбачыць вас зноў.
signed_up: Вітаем! Вы былі паспяхова зарэгістраваны.
signed_up_but_inactive: Вы паспяхова зарэгістраваліся. Аднак, мы не змаглі вас аўтарызаваць, таму што ваш уліковы запіс пакуль што не актывізаваны.
signed_up_but_locked: Вы паспяхова зарэгістраваліся. Аднак, мы не змаглі вас аўтарызаваць, таму што ваш уліковы запіс заблакаваны.
signed_up_but_pending: Ліст са спасылкай для пацверджання быў высланы на вашу электронную пошту. Пасля таго, як вы націсніце на спасылку, мы разгледзім вашу заяўку. Калі яна будзе ўхвалена, вы будзеце праінфармаваны.
signed_up_but_unconfirmed: Ліст са спасылкай для пацверджання быў высланы на вашу электронную пошту. Калі ласка, перайдзіце па спасылцы для актывацыі вашага ўліковага запісу. Праверце вашу тэчку са спамам, калі вы не атрымалі такі ліст.
update_needs_confirmation: Вы паспяхова абнавілі свой уліковы запіс, аднак, нам неабходна пацвердзіць ваш новы адрас электроннай пошты. Калі ласка, праверце вашу пошту і перайдзіце па спасылцы для пацверджання вашага новага адраса электроннай пошты. Праверце тэчку са спамам, калі вы не атрымалі такі ліст.
updated: Ваш уліковы запіс быў паспяхова абноўлены.
sessions:
Expand Down
5 changes: 0 additions & 5 deletions config/locales/devise.bg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@ bg:
updated_not_active: Паролата ви беше променена успешно.
registrations:
destroyed: Довиждане! Вашият акаунт беше успешно изтрит. Надяваме се скоро да ви видим пак.
signed_up: Добре дошли! Успешно се регистрирахте.
signed_up_but_inactive: Регистрирахте се успешно. Въпреки това, не може да влезете, тъй като акаунтът ви още не е задействан.
signed_up_but_locked: Регистрирахте се успешно. Въпреки това, не можете да влезете, тъй като акаунтът ви е заключен.
signed_up_but_pending: Изпратено е съобщение до адреса на имейла ви с връзка за потвърждение. След като щракнете върху линка, ние ще прегледаме заявлението ви. Ще бъдете уведомени при одобрение.
signed_up_but_unconfirmed: Е-писмо с връзка за потвърждение е изпратено до имейла ви. Последвайте връзката, за да задействате акаунта си. Проверете папката си за спам, ако не сте получили това е-писмо.
update_needs_confirmation: Успешно осъвременихте акаунта си, но трябва да потвърдим новия ви адрес на имейл. Проверете имейла си и отворете връзката за потвърждаване на новия имейл адрес. Проверете папката си за спам, ако не сте получили това е-писмо.
updated: Акаунтът ви е успешно осъвременен.
sessions:
Expand Down
5 changes: 0 additions & 5 deletions config/locales/devise.bn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,6 @@ bn:
updated_not_active: আপনার পাসওয়ার্ড সফলভাবে পরিবর্তন করা হয়েছে।
registrations:
destroyed: টাটা! আপনার অ্যাকাউন্ট সফলভাবে বাতিল করা হয়েছে। আশা করি শীঘ্রই আবার দেখা হবে তোমার সাথে।
signed_up: স্বাগতম! আপনার নিবন্ধনটি সঠিকভাবে হয়েছে।
signed_up_but_inactive: আপনি সফলভাবে সাইন আপ করেছেন। তবে আপনার অ্যাকাউন্টটি এখনও সক্রিয় না হওয়ার কারণে আমরা আপনাকে সাইন ইন করতে পারি নি।
signed_up_but_locked: আপনি সফলভাবে সাইন আপ করেছেন। তবে আপনার অ্যাকাউন্টটি লক থাকায় আমরা আপনাকে সাইন ইন করতে পারিনি।
signed_up_but_pending: আপনার ইমেল ঠিকানায় একটি নিশ্চিতকরণ লিঙ্ক সহ একটি বার্তা প্রেরণ করা হয়েছে। আপনি লিঙ্কটি ক্লিক করার পরে, আমরা আপনার আবেদন পর্যালোচনা করব। এটি অনুমোদিত হলে আপনাকে অবহিত করা হবে।
signed_up_but_unconfirmed: আপনার ইমেল ঠিকানায় একটি নিশ্চিতকরণ লিঙ্ক সহ একটি বার্তা প্রেরণ করা হয়েছে। আপনার অ্যাকাউন্টটি সক্রিয় করতে লিংকটি অনুসরণ করুন। আপনি এই ইমেলটি না পেলে দয়া করে আপনার স্প্যাম ফোল্ডারটি পরীক্ষা করুন।
update_needs_confirmation: আপনি আপনার অ্যাকাউন্টটি সফলভাবে আপডেট করেছেন, তবে আমাদের আপনার নতুন ইমেল ঠিকানা যাচাই করা দরকার। আপনার নতুন ইমেল ঠিকানাটি নিশ্চিত করতে দয়া করে আপনার ইমেলটি দেখুন এবং নিশ্চিত লিঙ্কটি অনুসরণ করুন। আপনি এই ইমেলটি না পেয়ে দয়া করে আপনার স্প্যাম ফোল্ডারটি পরীক্ষা করুন।
updated: আপনার অ্যাকাউন্ট সফলভাবে আপডেট করা হয়েছে।
sessions:
Expand Down
5 changes: 0 additions & 5 deletions config/locales/devise.br.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,6 @@ br:
updated_not_active: Kemmet eo bet ho ker-tremen ent reizh.
registrations:
destroyed: Kenavo! Ho kont a zo bet nullet gant berzh. Emichañs e viot adwelet tuchant.
signed_up: Donemat ! Enskrivet oc'h.
signed_up_but_inactive: Enskrivet oc'h bet gant berzh. N'omp ket evit anavezadenniñ ac'hanoc'h alatao, rak ho kont n'eo ket aotreet c'hoazh.
signed_up_but_locked: Enskrivet oc'h bet gant berzh. N'omp ket evit anavezadenniñ ac'hanoc'h alatao, rak ho kont a zo prennet.
signed_up_but_pending: Ur c'hemennad gant ul lec'hienn kadarnaat a zo bet kaset d'ho chomlec'h-postel. Pa vo kliket al lec'hienn ganeoc'h e vo gwiriet hoc'h arload ganeomp. Ur gemennadenn a vo kaset deoc'h hag-eñ eo erbedet ho kont.
signed_up_but_unconfirmed: Ur ch'emennad gant ul lec'hienn kadarnaat a zo bet kaset d'ho chomlec'h-postel. Mar plij, heuliit al lec'hienn evit gweredekaat ho kont. Gwiriit ho restr strobel ma ne oa ket resevet ar postel-mañ ganeoc'h.
update_needs_confirmation: Ho kont a zo bet hizivaet da benn, met ret eo deomp gwiriañ ho chomlec'h-postel nevez. Mar plij, gwiriit ho postelioù ha heuliit al lec'hienn evit kadarnaat ho chomlec'h-postel nevez. Gwiriit ho restr strobel ma ne oa ket resevet ar postel-mañ ganeoc'h.
updated: Ho kont a zo bet hizivaet da benn.
sessions:
Expand Down
5 changes: 0 additions & 5 deletions config/locales/devise.ca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,6 @@ ca:
updated_not_active: La contrasenya s'ha canviat correctament.
registrations:
destroyed: Adéu! el compte s'ha cancel·lat amb èxit. Desitgem veure't de nou ben aviat.
signed_up: Benvingut! T'has registrat.
signed_up_but_inactive: T'has registrat. Tanmateix, no podem iniciar la teva sessió perquè el compte encara no s'ha activat.
signed_up_but_locked: T'has registrat. Tanmateix, no podem iniciar la sessió perquè el compte està blocat.
signed_up_but_pending: S'ha enviat un missatge amb un enllaç de confirmació a la teva adreça de correu electrònic. Després que hagis fet clic a l'enllaç, revisarem la sol·licitud. Se't notificarà si s'aprova.
signed_up_but_unconfirmed: S'ha enviat per correu electrònic un missatge amb un enllaç de confirmació. Fes clic a l'enllaç per a activar el compte. Si us plau, verifica la teva carpeta de correu brossa si no el reps.
update_needs_confirmation: Has actualitzat el teu compte amb èxit, però necessitem verificar la teva nova adreça de correu. Si us plau comprova el correu i segueixi l'enllaç per confirmar la nova adreça de correu. Si us plau verifica la teva carpeta de correu brossa si no reps aquest correu.
updated: El teu compte ha estat actualitzat amb èxit.
sessions:
Expand Down
Loading