decidim-system 0.27.5 → 0.28.0.rc4

data/config/locales/sk.yml

@@ -6,15 +6,11 @@ sk:
         confirm_destroy: Naozaj chcete odstrániť?
         destroy: Odstrániť
         edit: Upraviť
-        new: Nový
         save: Uložit
         title: Akcie
       admins:
         create:
           error: Pri tvorbe nového správcu nastala chyba.
-          success: Správca úspešne vytvorený
-        destroy:
-          success: Správca úspešne vymazaný
         edit:
           title: Upraviť správcu
           update: Aktualizovať
@@ -23,11 +19,8 @@ sk:
         new:
           create: Vytvoriť
           title: Nový správca
-        show:
-          edit: Upraviť
         update:
           error: Pri aktualizácii správcu nastala chyba.
-          success: Správca úspešne aktualizovaný
       default_pages:
         placeholders:
           content: Prosíme pridajte zmysluplný obsah na statickú stránku %{page} na paneli správcu.
@@ -41,7 +34,6 @@ sk:
           fields:
             created_at: Vytvorené
             email: E-mail
-          name: Admin
           validations:
             email_uniqueness: správca s touto e-mailovou adresou už existuje
         organization:
@@ -55,7 +47,6 @@ sk:
       organizations:
         create:
           error: Pri vytváraní novej organizácie došlo k chybe.
-          success: Organizácia úspešne vytvorená.
         edit:
           secondary_hosts_hint: Zadajte každý host na nový riadok
         index:
@@ -86,7 +77,6 @@ sk:
         users_registration_mode:
           disabled: Môžete pristupovať iba pomocou externého účtu
           enabled: Umožniť účastníkom registráciu a prihlásenie sa
-          existing: Neumožniť účastníkom registráciu, ale umožniť prihlásenie sa existujúcim účastníkom
       shared:
         notices:
           no_organization_warning_html: Musíte vytvoriť organizáciu, aby ste mohli začať. Prečítajte si %{guide}, než začnete.

data/config/locales/sl.yml

@@ -6,15 +6,11 @@ sl:
         confirm_destroy: Ali ste prepričani, da želite izbrisati to?
         destroy: Izbriši
         edit: Uredi
-        new: Nov
         save: Shrani
         title: Dejanja
       admins:
         create:
           error: Pojavila se je težava pri kreiranju skrbnika.
-          success: Skrbnik uspešno kreiran
-        destroy:
-          success: Skrbnik uspešno izbrisan
         edit:
           title: Uredi skrbnika
           update: Posodobi
@@ -23,11 +19,8 @@ sl:
         new:
           create: Ustvari
           title: Nov skrbnik
-        show:
-          edit: Uredi
         update:
           error: Pojavila se je težava pri urejanju skrbnika.
-          success: Skrbnik uspešno posodobljen
       menu:
         admins: Skrbniki
         dashboard: Nadzorna plošča
@@ -37,7 +30,6 @@ sl:
           fields:
             created_at: Ustvarjen ob
             email: Email
-          name: Skrbnik
         organization:
           actions:
             save_and_invite: Ustvari organizacijo in povabi skrbnika
@@ -48,6 +40,5 @@ sl:
       organizations:
         create:
           error: Pojavila se je težava pri kreiranju organizacije.
-          success: Organizacija uspešno kreirana.
         index:
           title: Organizacije

data/config/locales/sv.yml

@@ -38,15 +38,11 @@ sv:
         confirm_destroy: Vill du radera detta?
         destroy: Radera
         edit: Redigera
-        new: Ny
         save: Spara
         title: Åtgärder
       admins:
         create:
           error: Det gick inte att skapa en ny administratör.
-          success: Administratören har skapats
-        destroy:
-          success: Administratören har raderats
         edit:
           title: Redigera administratören
           update: Uppdatera
@@ -55,11 +51,8 @@ sv:
         new:
           create: Skapa
           title: Ny administratör
-        show:
-          edit: Redigera
         update:
           error: Det gick inte att uppdatera administratören.
-          success: Administratören har uppdaterats
       dashboard:
         show:
           current_organizations: Nuvarande organisationer
@@ -77,7 +70,6 @@ sv:
           fields:
             created_at: Skapad
             email: E-post
-          name: Administratör
           validations:
             email_uniqueness: det finns redan en administratör med samma e-postadress
         oauth_application:
@@ -85,7 +77,6 @@ sv:
             created_at: Skapad den
             name: OAuth app namn
             organization_name: Organisation
-          name: OAuth app
         organization:
           actions:
             save_and_invite: Skapa organisation och bjud in administratör
@@ -95,7 +86,6 @@ sv:
             name: Namn
             omniauth_settings: Omniauth-inställningar
             smtp_settings: SMTP-inställningar
-          name: Organisation
       oauth_applications:
         create:
           error: Det gick inte att skapa appen.
@@ -123,7 +113,6 @@ sv:
           show: Visa avancerade inställningar
         create:
           error: Det gick inte att skapa en ny organisation.
-          success: Organisationen har skapats.
         edit:
           secondary_hosts_hint: Ange var och en av dem på en ny rad
         file_upload_settings:
@@ -158,8 +147,6 @@ sv:
         smtp_settings:
           fieldsets:
             sender: Avsändare
-          instructions:
-            from_label: 'E-postavsändare är: "your-organization-name <your-organization@your-provider.org>". Om du lämnar tomt kommer e-postadressen användas'
           placeholder:
             from_email: your-organization@example.org
             from_label: din-organisation-namn
@@ -169,7 +156,6 @@ sv:
         users_registration_mode:
           disabled: Åtkomst kan endast göras med externa konton
           enabled: Tillåt deltagare att registrera och logga in
-          existing: Tillåt inte deltagare att registrera sig, men tillåt inloggning från befintliga användare
       shared:
         notices:
           no_organization_warning_html: Kom igång genom att skapa en organisation. Läs %{guide} innan du fortsätter.

data/config/locales/tr-TR.yml

@@ -38,15 +38,14 @@ tr:
         confirm_destroy: Bunu silmek istediğinizden emin misiniz?
         destroy: Sil
         edit: Düzenle
-        new: Yeni
+        new_admin: Yeni Yönetici
+        new_oauth_application: Yetkilendirilmiş Uygulama
+        new_organization: Yeni organizasyon
         save: Kaydet
         title: Eylemler
       admins:
         create:
           error: Yeni bir yönetici oluşturulurken bir sorun oluştu.
-          success: Yönetici başarıyla oluşturuldu
-        destroy:
-          success: Yönetici başarıyla silindi
         edit:
           title: Yönetici düzenle
           update: Güncelle
@@ -55,11 +54,8 @@ tr:
         new:
           create: Oluştur
           title: Yeni yönetici
-        show:
-          edit: Düzenle
         update:
           error: Bu yönetici güncellenirken bir sorun oluştu.
-          success: Yönetici başarıyla güncellendi
       default_pages:
         placeholders:
           content: Lütfen yönetici panosundaki %{page} statik sayfasına anlamlı içerik ekleyin.
@@ -74,7 +70,6 @@ tr:
           fields:
             created_at: Adresinde düzenlendi
             email: E-posta
-          name: yönetim
           validations:
             email_uniqueness: aynı e-postaya sahip başka bir yönetici zaten var
         oauth_application:
@@ -82,7 +77,6 @@ tr:
             created_at: Oluşturuldu
             name: OAuth Uygulama Adı
             organization_name: Kuruluş
-          name: OAuth uygulaması
         organization:
           actions:
             save_and_invite: Kuruluş oluşturun ve yöneticiyi davet edin
@@ -92,7 +86,6 @@ tr:
             name: Adı
             omniauth_settings: Omniauth ayarları
             smtp_settings: SMTP ayarları
-          name: Kuruluş
       oauth_applications:
         create:
           error: Bu uygulama oluşturulurken bir hata oluştu.
@@ -117,7 +110,6 @@ tr:
       organizations:
         create:
           error: Yeni bir organizasyon oluştururken bir sorun oluştu.
-          success: Kuruluş başarıyla oluşturuldu.
         edit:
           secondary_hosts_hint: Her birini yeni bir satıra girin
         file_upload_settings:
@@ -163,8 +155,6 @@ tr:
         smtp_settings:
           fieldsets:
             sender: Gönderen
-          instructions:
-            from_label: 'E-posta göndereni: "your-organization-name <your-organization@example.org>" olacaktır. ''E-posta adresini'' etiket olarak kullanmak için boş bırakın'
           placeholder:
             from_email: your-organization@example.org
             from_label: your-organization-name
@@ -174,7 +164,6 @@ tr:
         users_registration_mode:
           disabled: Erişim yalnızca harici hesaplarla yapılabilir
           enabled: Katılımcıların kaydolmasına ve giriş yapmasına izin ver
-          existing: Katılımcıların kaydolmasına izin verme, ancak mevcut katılımcıların giriş yapmasına izin ver
       shared:
         notices:
           no_organization_warning_html: Başlamak için bir organizasyon oluşturmanız gerekir. Devam etmeden önce %{guide} okuduğunuzdan emin olun.

data/config/locales/uk.yml

@@ -6,15 +6,11 @@ uk:
         confirm_destroy: Ви впевнені, що хочете видалити це?
         destroy: Видалити
         edit: Редагувати
-        new: Додати
         save: Зберегти
         title: Дії
       admins:
         create:
           error: При спробі додати нового адміністратора сталася помилка.
-          success: Адміністратора успішно додано
-        destroy:
-          success: Адміністратора успішно видалено
         edit:
           title: Редагувати адміністратора
           update: Оновити
@@ -23,11 +19,8 @@ uk:
         new:
           create: Додати
           title: Додати адміністратора
-        show:
-          edit: Редагувати
         update:
           error: При спробі оновити цього адміністратора сталася помилка.
-          success: Адміністратора успішно оновлено
       default_pages:
         placeholders:
           content: Будь ласка, додайте змістовний вміст на статичну сторінку %{page} на приладній дошці адміністратора.
@@ -41,7 +34,6 @@ uk:
           fields:
             created_at: 'Додано:'
             email: Адреса електронної пошти
-          name: Адміністратор
           validations:
             email_uniqueness: вже є інший адміністратор з такою ж адресою електронної пошти
         organization:
@@ -53,7 +45,6 @@ uk:
       organizations:
         create:
           error: При спробі додати нову організацію сталася помилка.
-          success: Організацію успішно додано.
         edit:
           secondary_hosts_hint: Введіть кожен з них в новому рядку
         index:

data/config/locales/zh-CN.yml

@@ -31,15 +31,11 @@ zh-CN:
         confirm_destroy: 您确定要删除这个吗？
         destroy: 删除
         edit: 编辑
-        new: 新的
         save: 保存
         title: 行动
       admins:
         create:
           error: 创建新管理员时出错。
-          success: 管理员创建成功
-        destroy:
-          success: 管理员删除成功
         edit:
           title: 编辑管理员
           update: 更新
@@ -48,11 +44,8 @@ zh-CN:
         new:
           create: 创建
           title: 新管理员
-        show:
-          edit: 编辑
         update:
           error: 更新此管理员时出错。
-          success: 管理员更新成功
       default_pages:
         placeholders:
           content: 请添加有意义的内容到管理仪表盘上的 %{page} 静态页面。
@@ -67,7 +60,6 @@ zh-CN:
           fields:
             created_at: 创建于
             email: 电子邮件地址
-          name: 管理员
           validations:
             email_uniqueness: 已存在具有相同电子邮件的其他管理员
         oauth_application:
@@ -75,7 +67,6 @@ zh-CN:
             created_at: 创建于
             name: OAuth 应用程序名称
             organization_name: 组织
-          name: OAuth 应用程序
         organization:
           actions:
             save_and_invite: 创建机构并邀请管理员
@@ -85,7 +76,6 @@ zh-CN:
             name: 名称
             omniauth_settings: Omniauth 设置
             smtp_settings: SMTP 设置
-          name: 组织
       oauth_applications:
         create:
           error: 创建此应用程序时出现问题。
@@ -110,7 +100,6 @@ zh-CN:
       organizations:
         create:
           error: 创建一个新组织时出现问题。
-          success: 组织成功创建。
         edit:
           secondary_hosts_hint: 在新行中输入其中每一个
         file_upload_settings:
@@ -163,7 +152,6 @@ zh-CN:
         users_registration_mode:
           disabled: 只能通过外部帐户访问
           enabled: 允许参与者注册并登录
-          existing: 不允许参与者注册，但允许现有参与者登录
       shared:
         notices:
           no_organization_warning_html: 您必须创建一个组织才能启动。请确保您在继续之前阅读 %{guide}。

data/config/locales/zh-TW.yml

@@ -38,15 +38,14 @@ zh-TW:
         confirm_destroy: 是否確定要刪除這個？
         destroy: 刪除
         edit: 編輯
-        new: 新的
         save: 儲存
         title: 操作
       admins:
         create:
           error: 新增管理員時發生問題
-          success: 管理員創建成功
+          success: 管理員創建成功.
         destroy:
-          success: 管理員成功刪除
+          success: 管理員成功刪除.
         edit:
           title: 編輯管理貝
           update: 更新
@@ -55,18 +54,18 @@ zh-TW:
         new:
           create: 建立
           title: 新增管理員
-        show:
-          edit: 編輯
         update:
           error: 更新此管理員時發生問題。
-          success: 管理員已成功更新
+          success: 管理員已成功更新.
       dashboard:
         show:
           current_organizations: 目前組織
       default_pages:
         placeholders:
           content: 請在管理員儀表板的 %{page} 靜態頁面上新增有意義的內容。
+          summary: 請在管理員儀表板的 %{page} 靜態頁面上新增有意義的摘要
           title: 預設的 %{page} 標題
+        terms-of-service: 服務條款
       menu:
         admins: 管理員
         dashboard: 儀表板
@@ -77,7 +76,6 @@ zh-TW:
           fields:
             created_at: 建立於
             email: 電子郵件
-          name: 管理員
           validations:
             email_uniqueness: 已有相同電子郵件的其他管理員存在
         oauth_application:
@@ -85,7 +83,6 @@ zh-TW:
             created_at: 建立於
             name: OAuth 應用程式名稱
             organization_name: 組織
-          name: Oauth 應用程式
         organization:
           actions:
             save_and_invite: 建立組織並邀請管理員
@@ -95,7 +92,6 @@ zh-TW:
             name: 姓名
             omniauth_settings: Omniauth 設置
             smtp_settings: SMTP設定
-          name: 組織
       oauth_applications:
         create:
           error: 創建應用程序時出現問題。
@@ -123,7 +119,6 @@ zh-TW:
           show: 顯示進階設定
         create:
           error: 創建新組織時發生問題。
-          success: 組織創建成功。
         edit:
           secondary_hosts_hint: 請在新的一行輸入每一個
         file_upload_settings:
@@ -172,7 +167,7 @@ zh-TW:
           fieldsets:
             sender: 寄件者
           instructions:
-            from_label: '郵件發送者將會是："您的組織名稱 <your-organization@example.org>"。若要使用「電子郵件地址」作為標籤，請留空'
+            from_label: '郵件發送者將會是："您的組織名稱 <your-organization@example.org>"。若要使用「電子郵件地址」作為標籤，請留空.'
           placeholder:
             from_email: your-organization@example.org
             from_label: 你的組織名稱

data/config/routes.rb

@@ -11,8 +11,12 @@ Decidim::System::Engine.routes.draw do
              }
 
   authenticate(:admin) do
-    resources :organizations, except: [:destroy]
-    resources :admins
+    resources :organizations, except: [:show, :destroy] do
+      member do
+        post :resend_invitation
+      end
+    end
+    resources :admins, except: [:show]
     resources :oauth_applications
 
     root to: "dashboard#show"

data/db/seeds.rb

@@ -6,7 +6,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
   password = ENV.fetch("DECIDIM_SYSTEM_USER_PASSWORD", "decidim123456789")
 
   Decidim::System::Admin.find_or_initialize_by(email: "system@example.org").update!(
-    password: password,
+    password:,
     password_confirmation: password
   )
 

data/lib/decidim/system/engine.rb

@@ -6,6 +6,7 @@ require "active_support/all"
 require "devise"
 require "devise-i18n"
 require "decidim/core"
+require "decidim/system/menu"
 require "foundation_rails_helper"
 
 module Decidim
@@ -21,31 +22,7 @@ module Decidim
       end
 
       initializer "decidim_system.menu" do
-        Decidim.menu :system_menu do |menu|
-          menu.add_item :root,
-                        I18n.t("menu.dashboard", scope: "decidim.system"),
-                        decidim_system.root_path,
-                        position: 1,
-                        active: ["decidim/system/dashboard" => :show]
-
-          menu.add_item :organizations,
-                        I18n.t("menu.organizations", scope: "decidim.system"),
-                        decidim_system.organizations_path,
-                        position: 2,
-                        active: :inclusive
-
-          menu.add_item :admins,
-                        I18n.t("menu.admins", scope: "decidim.system"),
-                        decidim_system.admins_path,
-                        position: 3,
-                        active: :inclusive
-
-          menu.add_item :oauth_applications,
-                        I18n.t("menu.oauth_applications", scope: "decidim.system"),
-                        decidim_system.oauth_applications_path,
-                        position: 4,
-                        active: [%w(decidim/system/oauth_applications), []]
-        end
+        Decidim::System::Menu.register_system_menu!
       end
 
       initializer "decidim_system.webpacker.assets_path" do

data/lib/decidim/system/menu.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module System
+    class Menu
+      def self.register_system_menu!
+        Decidim.menu :system_menu do |menu|
+          menu.add_item :root,
+                        I18n.t("menu.dashboard", scope: "decidim.system"),
+                        decidim_system.root_path,
+                        position: 1,
+                        active: ["decidim/system/dashboard" => :show]
+
+          menu.add_item :organizations,
+                        I18n.t("menu.organizations", scope: "decidim.system"),
+                        decidim_system.organizations_path,
+                        position: 2,
+                        active: :inclusive
+
+          menu.add_item :admins,
+                        I18n.t("menu.admins", scope: "decidim.system"),
+                        decidim_system.admins_path,
+                        position: 3,
+                        active: :inclusive
+
+          menu.add_item :oauth_applications,
+                        I18n.t("menu.oauth_applications", scope: "decidim.system"),
+                        decidim_system.oauth_applications_path,
+                        position: 4,
+                        active: [%w(decidim/system/oauth_applications), []]
+        end
+      end
+    end
+  end
+end

data/lib/decidim/system/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-system version.
   module System
     def self.version
-      "0.27.5"
+      "0.28.0.rc4"
     end
   end
 end

data/lib/tasks/decidim_system.rake

@@ -8,7 +8,7 @@ namespace :decidim_system do
     password = prompt("Password")
     password_confirmation = prompt("Password confirmation")
 
-    admin = Decidim::System::Admin.new(email: email, password: password, password_confirmation: password_confirmation)
+    admin = Decidim::System::Admin.new(email:, password:, password_confirmation:)
 
     if admin.valid?
       admin.save!