decidim-conferences 0.30.0 → 0.30.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/commands/decidim/conferences/admin/invite_user_to_join_conference.rb +1 -1
- data/app/permissions/decidim/conferences/permissions.rb +0 -2
- data/app/views/decidim/conferences/admin/conferences/index.html.erb +11 -9
- data/config/locales/sv.yml +8 -8
- data/lib/decidim/conferences/version.rb +1 -1
- metadata +10 -10
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9093680254a494915df572af791a4ffdb3a761f5444e47875973be71fb4d87fd
|
4
|
+
data.tar.gz: 8b59f52c05c22515b1eca3dae61977ac77b612e8b1997a206ceef85b83363f04
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 811a5ca2559c5c9162c376d7b9c18224e58c068fe9f8aab579bc977220445fc9858bb030ebbfe6df5805ee813ebcce331595d414267e68d82721d103f7d1d11f
|
7
|
+
data.tar.gz: 8d58f2391f072376b15c75a46be6aa6af9d906671cc190e69e306f090a404021c32e26662a09fcc1be138818357e90d0347f3a23b81f6bee7225598845f1476a
|
@@ -79,7 +79,7 @@ module Decidim
|
|
79
79
|
end
|
80
80
|
else
|
81
81
|
user.name = form.name
|
82
|
-
user.nickname = UserBaseEntity.nicknamize(user.name,
|
82
|
+
user.nickname = UserBaseEntity.nicknamize(user.name, user.decidim_organization_id)
|
83
83
|
invite_user_to_sign_up
|
84
84
|
create_invitation!
|
85
85
|
end
|
@@ -12,14 +12,16 @@
|
|
12
12
|
</tbody>
|
13
13
|
</table>
|
14
14
|
</div>
|
15
|
-
|
16
|
-
|
17
|
-
<%=
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
15
|
+
<% if allowed_to? :read, :conference, trashable_deleted_resource: @conferences %>
|
16
|
+
<div class="card mt-4">
|
17
|
+
<%= link_to manage_trash_conferences_path, class: "flex items-center underline text-secondary" do %>
|
18
|
+
<%= icon "delete-bin-2-line", class: "mr-2 fill-current text-secondary", role: "img" %>
|
19
|
+
<%= t("decidim.admin.actions.view_deleted_conferences") %>
|
20
|
+
<span class="ml-2">
|
21
|
+
<%= icon_with_tooltip("information-line", t("decidim.admin.tooltips.deleted_conferences_info")) %>
|
22
|
+
</span>
|
23
|
+
<% end %>
|
24
|
+
</div>
|
25
|
+
<% end %>
|
24
26
|
<%= decidim_paginate @conferences %>
|
25
27
|
</div>
|
data/config/locales/sv.yml
CHANGED
@@ -46,7 +46,7 @@ sv:
|
|
46
46
|
conference_registration_invite:
|
47
47
|
email: E-post
|
48
48
|
name: Namn
|
49
|
-
registration_type_id: Typ av
|
49
|
+
registration_type_id: Typ av anmälan
|
50
50
|
user_id: Användare
|
51
51
|
conference_registration_type:
|
52
52
|
description: Beskrivning
|
@@ -212,7 +212,7 @@ sv:
|
|
212
212
|
media_links: Medialänkar
|
213
213
|
moderations: Moderering
|
214
214
|
partners: Partners
|
215
|
-
registration_types: Typer av
|
215
|
+
registration_types: Typer av anmälan
|
216
216
|
registrations: Registreringar
|
217
217
|
see_conference: Visa konferens
|
218
218
|
user_registrations: Användarregistreringar
|
@@ -437,11 +437,11 @@ sv:
|
|
437
437
|
conference_registration_mailer:
|
438
438
|
confirmation:
|
439
439
|
confirmed_html: Din registrering för konferensen <a href="%{url}">%{title}</a> har bekräftats.
|
440
|
-
details_1: 'Du är
|
440
|
+
details_1: 'Du är anmäld till konferensen med anmälningstyp %{registration_type}. Det kostar %{price} och du kan delta i följande arrangemang:'
|
441
441
|
details_2: Du hittar konferensens detaljer i bilagan.
|
442
442
|
pending_validation:
|
443
443
|
confirmation_pending: Du kommer snart att få bekräftelsen
|
444
|
-
details: 'Du har
|
444
|
+
details: 'Du har anmält dig med %{registration_type} till en kostnad av %{price} och du kan delta i följande arrangemang:'
|
445
445
|
pending_html: Väntar på bekräftelse för din registrering till konferensen <a href="%{url}">%{title}</a>.
|
446
446
|
conference_registrations:
|
447
447
|
create:
|
@@ -480,7 +480,7 @@ sv:
|
|
480
480
|
login_as: Du är inloggad som %{name} <%{email}>
|
481
481
|
make_conference_registration: Anmäl dig till konferensen
|
482
482
|
manage_registration: Hantera anmälan
|
483
|
-
register:
|
483
|
+
register: Anmälan
|
484
484
|
sign_in_description: Logga in för att anmäla dig till konferensen
|
485
485
|
sign_up_description: Skapa ett konto för att anmäla dig till konferensen
|
486
486
|
content_blocks:
|
@@ -532,7 +532,7 @@ sv:
|
|
532
532
|
index:
|
533
533
|
choose_an_option: 'Välj registreringsalternativ:'
|
534
534
|
no_registrations: Inga anmälningar
|
535
|
-
register:
|
535
|
+
register: Anmälan
|
536
536
|
title: Registreringstyper
|
537
537
|
show:
|
538
538
|
details: Detaljer
|
@@ -576,7 +576,7 @@ sv:
|
|
576
576
|
email_subject: Konferensen "%{resource_title}" har uppdaterats
|
577
577
|
notification_title: Konferensen <a href="%{resource_path}">%{resource_title}</a> har uppdaterats.
|
578
578
|
registrations_enabled:
|
579
|
-
email_intro: 'Konferensen "%{resource_title}" har tar nu emot
|
579
|
+
email_intro: 'Konferensen "%{resource_title}" har tar nu emot anmälningar. Du kan själv anmäla dig på den här sidan:'
|
580
580
|
email_outro: Du har fått det här meddelandet eftersom du följer konferensen "%{resource_title}". Du kan sluta att följa den via föregående länk.
|
581
581
|
email_subject: Konferensen "%{resource_title}" tar nu emot registreringar.
|
582
582
|
notification_title: Konferensen <a href="%{resource_path}">%{resource_title}</a> tar nu emot registreringar.
|
@@ -625,7 +625,7 @@ sv:
|
|
625
625
|
layouts:
|
626
626
|
decidim:
|
627
627
|
conference_hero:
|
628
|
-
register:
|
628
|
+
register: Anmäl dig
|
629
629
|
conferences:
|
630
630
|
conference:
|
631
631
|
more_info: Mer information
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: decidim-conferences
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.30.
|
4
|
+
version: 0.30.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Isaac Massot Gil
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2025-
|
11
|
+
date: 2025-06-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: decidim-core
|
@@ -16,56 +16,56 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.30.
|
19
|
+
version: 0.30.1
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.30.
|
26
|
+
version: 0.30.1
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: decidim-meetings
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - '='
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 0.30.
|
33
|
+
version: 0.30.1
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - '='
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 0.30.
|
40
|
+
version: 0.30.1
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: decidim-admin
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
45
|
- - '='
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 0.30.
|
47
|
+
version: 0.30.1
|
48
48
|
type: :development
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - '='
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 0.30.
|
54
|
+
version: 0.30.1
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: decidim-dev
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - '='
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: 0.30.
|
61
|
+
version: 0.30.1
|
62
62
|
type: :development
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - '='
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: 0.30.
|
68
|
+
version: 0.30.1
|
69
69
|
description: Conferences component for decidim.
|
70
70
|
email:
|
71
71
|
- isaac.mg@coditramuntana.com
|