Skip to content

Commit

Permalink
Merge branch 'dev' for release 6.3.10
Browse files Browse the repository at this point in the history
  • Loading branch information
gnepud committed Jan 19, 2024
2 parents c770ab3 + ccc684e commit 9e5740b
Show file tree
Hide file tree
Showing 11 changed files with 1,974 additions and 1,970 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Expand Up @@ -2,6 +2,11 @@

## Next release

## v6.3.10 2024 January 19

- Fix a bug: unable to update event recurrence
- updates translations

## v6.3.9 2024 January 8

- translation files added for Swedish
Expand Down
3 changes: 1 addition & 2 deletions app/frontend/src/javascript/components/events/event-form.tsx
Expand Up @@ -132,8 +132,7 @@ export const EventForm: React.FC<EventFormProps> = ({ action, event, onError, on
* Check if any dates have changed
*/
const datesHaveChanged = (): boolean => {
return ((event?.start_date !== (updatingEvent?.start_date as Date)?.toISOString()?.substring(0, 10)) ||
(event?.end_date !== (updatingEvent?.end_date as Date)?.toISOString()?.substring(0, 10)));
return (event?.start_date !== updatingEvent?.start_date) || (event?.end_date !== updatingEvent?.end_date);
};

/**
Expand Down
588 changes: 294 additions & 294 deletions config/locales/app.logged.sv.yml

Large diffs are not rendered by default.

982 changes: 491 additions & 491 deletions config/locales/app.public.sv.yml

Large diffs are not rendered by default.

930 changes: 465 additions & 465 deletions config/locales/app.shared.sv.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/locales/base.sv.yml
Expand Up @@ -2,4 +2,4 @@ sv:
time:
formats:
#See http://apidock.com/ruby/DateTime/strftime for a list of available directives
hour_minute: "%I:%M %p"
hour_minute: "%H:%M"
92 changes: 46 additions & 46 deletions config/locales/devise.sv.yml
Expand Up @@ -2,62 +2,62 @@
sv:
devise:
confirmations:
confirmed: "Your account was successfully confirmed."
send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
confirmed: "Ditt konto har uppdaterats."
send_instructions: "Inom några minuter får du ett e-postmeddelande med instruktioner för hur du bekräftar ditt konto."
send_paranoid_instructions: "Om din e-postadress finns i vår databas får du inom några minuter ett e-postmeddelande med instruktioner för hur du bekräftar ditt konto."
failure:
already_authenticated: "You are already signed in."
inactive: "Your account is not activated yet."
invalid: "Invalid email or password."
locked: "Your account is locked."
last_attempt: "You have one more attempt before your account will be locked."
not_found_in_database: "Invalid email or password."
timeout: "Your session expired. Please sign in again to continue."
unauthenticated: "You need to sign in or sign up before continuing."
unconfirmed: "You have to confirm your account before continuing. Please click on the link below the form."
already_authenticated: "Du har redan loggat in."
inactive: "Ditt konto har inte aktiverats ännu."
invalid: "Ogiltig e-postadress eller lösenord."
locked: "Ditt konto är låst."
last_attempt: "Du har ett försök kvar innan vi låser kontot."
not_found_in_database: "Ogiltig e-postadress eller lösenord."
timeout: "Din session har upphört att gälla. Vänligen logga in igen om du vill fortsätta."
unauthenticated: "Du måste logga in eller skapa ett konto innan du kan fortsätta."
unconfirmed: "Du måste bekräfta ditt konto innan du fortsätter. Klicka på länken nedanför formuläret."
mailer:
confirmation_instructions:
action: "Confirm my email address"
instruction: "You can finalize your registration by confirming your email address. Please click on the following link:"
subject: "Confirmation instructions"
action: "Bekräfta e-postadress"
instruction: "Du kan slutföra din registrering genom att bekräfta din e-postadress. Klicka på följande länk:"
subject: "Bekräftelseinstruktioner"
reset_password_instructions:
action: "Change my password"
instruction: "Someone asked for a link to change your password. You can do it through the link below."
ignore_otherwise: "If you have not made this request, please ignore this message."
subject: "Reset password instructions"
action: "Byt lösenord"
instruction: "Någon har begärt att ändra ditt lösenordet. Du kan göra det genom länken nedan."
ignore_otherwise: "Om du inte har gjort denna begäran, vänligen ignorera detta meddelande."
subject: "Instruktioner för återställning av lösenord"
unlock_instructions:
subject: "Unlock Instructions"
subject: "Instruktioner för upplåsning"
omniauth_callbacks:
failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
success: "Successfully authenticated from %{kind} account."
failure: "Kunde inte autentisera dig med %{kind} på grund av \"%{reason}\"."
success: "Autentiserat med %{kind}-konto."
passwords:
no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
updated: "Your password was changed successfully. You are now signed in."
updated_not_active: "Your password was changed successfully."
no_token: "Tillgång till den här sidan kräver att du fått ett mejl som sätter tillbaka ditt lösenord. Om du kom hit från ett sådant mejl, säkerställ att du har använt hela URL: en."
send_instructions: "Du kommer få ett mejl med instruktioner för hur du kan återställa ditt lösenord inom några minuter."
send_paranoid_instructions: "Om din e-postadress finns i vår databas kommer du att få en länk för lösenordsåterställning via e-post inom några minuter."
updated: "Ditt lösenord har ändrats. Du är nu inloggad."
updated_not_active: "Ditt lösenord har ändrats."
registrations:
destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
signed_up: "Welcome! You have signed up successfully."
signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
updated: "You updated your account successfully."
destroyed: "Hej då! Ditt konto har nu avslutats. Vi hoppas att vi snart ses igen."
signed_up: "Välkommen! Du har registrerat dig."
signed_up_but_inactive: "Din registrering är klar. Men vi kunde inte logga in dig eftersom ditt konto ännu inte är aktiverat."
signed_up_but_locked: "Din registrering är klar. Men vi kunde inte logga in dig eftersom ditt konto är låst."
signed_up_but_unconfirmed: "Ett meddelande med en bekräftelselänk har skickats till din e-postadress. Aktivera ditt konto genom att klicka på den länken."
update_needs_confirmation: "Du uppdaterade ditt konto, men vi måste verifiera din nya e-postadress. Kontrollera din e-post och klicka på bekräftelselänken för att slutföra bekräftandet av din nya e-postadress."
updated: "Ditt konto har uppdaterats."
sessions:
signed_in: "Signed in successfully."
signed_out: "Signed out successfully."
signed_in: "Inloggningen lyckades."
signed_out: "Du har loggats ut."
unlocks:
send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
unlocked: "Your account has been unlocked successfully. Please sign in to continue."
send_instructions: "Inom några minuter får du ett e-postmeddelande med instruktioner för hur du låser upp ditt konto."
send_paranoid_instructions: "Om ditt konto finns får du inom några minuter ett e-postmeddelande med instruktioner för hur du låser upp det."
unlocked: "Ditt konto har blivit upplåst. Logga in för att fortsätta."
errors:
messages:
already_confirmed: "This email was already confirmed, please try signing in."
confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
expired: "has expired, please request a new one"
not_found: "This email was not found"
not_locked: "was not locked"
already_confirmed: "Detta e-postmeddelande har redan bekräftats, försök logga in."
confirmation_period_expired: "måste bekräftas inom %{period}, vänligen begär ett nytt"
expired: "har gått ut, vänligen begär ett nytt"
not_found: "Meddelandet hittades inte"
not_locked: ""
not_saved:
one: "1 error prohibited this %{resource} from being saved:"
other: "%{count} errors prohibited this %{resource} from being saved:"
one: "1 fel gjorde att denna %{resource} inte kunde sparas:"
other: "%{count} fel gjorde att denna %{resource} inte kunde sparas:"
2 changes: 1 addition & 1 deletion config/locales/fr.yml
Expand Up @@ -49,7 +49,7 @@ fr:
gateway_amount_too_large: "Les paiements supérieurs à %{AMOUNT} ne sont pas pris en charge. Merci de passer commande directement à l'accueil."
product_in_use: "Ce produit a déjà été commandé"
slug_already_used: "est déjà utilisée"
birthday_less_than_18_years_ago: "l'age devez avoir au moins 18 ans"
birthday_less_than_18_years_ago: "L'age doit être inférieur à 18 ans"
coupon:
code_format_error: "seules les majuscules, chiffres et tirets sont autorisés"
apipie:
Expand Down

0 comments on commit 9e5740b

Please sign in to comment.