From ce8427ea6fd10d3924563d4a2ee5e931e1de1f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Fri, 15 Apr 2022 11:20:55 +0200
Subject: [PATCH] sirene => siren
---
app/controllers/admin/university/organizations_controller.rb | 2 +-
app/views/admin/university/organizations/_form.html.erb | 2 +-
app/views/admin/university/organizations/show.html.erb | 4 ++--
app/views/admin/university/organizations/static.html.erb | 2 +-
config/locales/university/en.yml | 2 +-
config/locales/university/fr.yml | 2 +-
db/migrate/20220307053000_create_university_organizations.rb | 2 +-
test/controllers/university/organizations_controller_test.rb | 4 ++--
test/fixtures/university/organizations.yml | 4 ++--
test/system/university/organizations_test.rb | 4 ++--
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/app/controllers/admin/university/organizations_controller.rb b/app/controllers/admin/university/organizations_controller.rb
index a2a437a76..3aadaf0dd 100644
--- a/app/controllers/admin/university/organizations_controller.rb
+++ b/app/controllers/admin/university/organizations_controller.rb
@@ -60,7 +60,7 @@ class Admin::University::OrganizationsController < Admin::University::Applicatio
def organization_params
params.require(:university_organization)
.permit(
- :name, :long_name, :slug, :description, :active, :sirene, :kind,
+ :name, :long_name, :slug, :description, :active, :siren, :kind,
:address, :zipcode, :city, :country, :text,
:url, :phone, :email, :logo, :logo_delete
)
diff --git a/app/views/admin/university/organizations/_form.html.erb b/app/views/admin/university/organizations/_form.html.erb
index 090877041..778f9ee32 100644
--- a/app/views/admin/university/organizations/_form.html.erb
+++ b/app/views/admin/university/organizations/_form.html.erb
@@ -45,7 +45,7 @@
</div>
<div class="col-md-6">
<%= f.input :kind, include_blank: false %>
- <%= f.input :sirene %>
+ <%= f.input :siren %>
</div>
</div>
</div>
diff --git a/app/views/admin/university/organizations/show.html.erb b/app/views/admin/university/organizations/show.html.erb
index 428eb5548..7b3fbe417 100644
--- a/app/views/admin/university/organizations/show.html.erb
+++ b/app/views/admin/university/organizations/show.html.erb
@@ -54,8 +54,8 @@
<div class="col-md-6">
<h3 class="h5"><%= University::Organization.human_attribute_name(:kind) %></h3>
<p><%= @organization.kind_i18n %></p>
- <h3 class="h5"><%= University::Organization.human_attribute_name(:sirene) %></h3>
- <p><%= @organization.sirene %></p>
+ <h3 class="h5"><%= University::Organization.human_attribute_name(:siren) %></h3>
+ <p><%= @organization.siren %></p>
</div>
</div>
</div>
diff --git a/app/views/admin/university/organizations/static.html.erb b/app/views/admin/university/organizations/static.html.erb
index 23a054ad3..39002994c 100644
--- a/app/views/admin/university/organizations/static.html.erb
+++ b/app/views/admin/university/organizations/static.html.erb
@@ -5,7 +5,7 @@ slug: "<%= @about.slug %>"
long_name: >
<%= @about.long_name %>
kind: "<%= @about.kind %>"
-sirene: "<%= @about.sirene %>"
+siren: "<%= @about.siren %>"
address: "<%= @about.address %>"
zipcode: "<%= @about.zipcode %>"
city: "<%= @about.city %>"
diff --git a/config/locales/university/en.yml b/config/locales/university/en.yml
index c9ba0ebd4..7762500fb 100644
--- a/config/locales/university/en.yml
+++ b/config/locales/university/en.yml
@@ -62,7 +62,7 @@ en:
phone: Telephone
email: Email
kind: Kind
- sirene: Legal identification number
+ siren: Legal identification number
university/organization/import:
file: File (.csv)
university/role:
diff --git a/config/locales/university/fr.yml b/config/locales/university/fr.yml
index 2c89406f5..f016ee4c0 100644
--- a/config/locales/university/fr.yml
+++ b/config/locales/university/fr.yml
@@ -62,7 +62,7 @@ fr:
phone: Téléphone
email: Email
kind: Type
- sirene: Numéro de SIRENE
+ siren: Numéro de SIREN
university/organization/import:
file: Fichier (.csv)
university/role:
diff --git a/db/migrate/20220307053000_create_university_organizations.rb b/db/migrate/20220307053000_create_university_organizations.rb
index 890151d3d..0d57f89aa 100644
--- a/db/migrate/20220307053000_create_university_organizations.rb
+++ b/db/migrate/20220307053000_create_university_organizations.rb
@@ -13,7 +13,7 @@ class CreateUniversityOrganizations < ActiveRecord::Migration[6.1]
t.string :phone
t.string :mail
t.boolean :active, default: true
- t.string :sirene
+ t.string :siren
t.integer :kind, default: 10
t.timestamps
diff --git a/test/controllers/university/organizations_controller_test.rb b/test/controllers/university/organizations_controller_test.rb
index 99b5e81e4..0e30e40fb 100644
--- a/test/controllers/university/organizations_controller_test.rb
+++ b/test/controllers/university/organizations_controller_test.rb
@@ -17,7 +17,7 @@ class University::OrganizationsControllerTest < ActionDispatch::IntegrationTest
test "should create university_organization" do
assert_difference('University::Organization.count') do
- post university_organizations_url, params: { university_organization: { active: @university_organization.active, address: @university_organization.address, city: @university_organization.city, country: @university_organization.country, description: @university_organization.description, kind: @university_organization.kind, mail: @university_organization.mail, phone: @university_organization.phone, sirene: @university_organization.sirene, title: @university_organization.title, website: @university_organization.website, zipcode: @university_organization.zipcode } }
+ post university_organizations_url, params: { university_organization: { active: @university_organization.active, address: @university_organization.address, city: @university_organization.city, country: @university_organization.country, description: @university_organization.description, kind: @university_organization.kind, mail: @university_organization.mail, phone: @university_organization.phone, siren: @university_organization.siren, title: @university_organization.title, website: @university_organization.website, zipcode: @university_organization.zipcode } }
end
assert_redirected_to university_organization_url(University::Organization.last)
@@ -34,7 +34,7 @@ class University::OrganizationsControllerTest < ActionDispatch::IntegrationTest
end
test "should update university_organization" do
- patch university_organization_url(@university_organization), params: { university_organization: { active: @university_organization.active, address: @university_organization.address, city: @university_organization.city, country: @university_organization.country, description: @university_organization.description, kind: @university_organization.kind, mail: @university_organization.mail, phone: @university_organization.phone, sirene: @university_organization.sirene, title: @university_organization.title, website: @university_organization.website, zipcode: @university_organization.zipcode } }
+ patch university_organization_url(@university_organization), params: { university_organization: { active: @university_organization.active, address: @university_organization.address, city: @university_organization.city, country: @university_organization.country, description: @university_organization.description, kind: @university_organization.kind, mail: @university_organization.mail, phone: @university_organization.phone, siren: @university_organization.siren, title: @university_organization.title, website: @university_organization.website, zipcode: @university_organization.zipcode } }
assert_redirected_to university_organization_url(@university_organization)
end
diff --git a/test/fixtures/university/organizations.yml b/test/fixtures/university/organizations.yml
index e20b37fe7..6f12c363e 100644
--- a/test/fixtures/university/organizations.yml
+++ b/test/fixtures/university/organizations.yml
@@ -43,7 +43,7 @@ one:
phone: MyString
mail: MyString
active: false
- sirene: MyString
+ siren: MyString
kind: 1
two:
@@ -57,5 +57,5 @@ two:
phone: MyString
mail: MyString
active: false
- sirene: MyString
+ siren: MyString
kind: 1
diff --git a/test/system/university/organizations_test.rb b/test/system/university/organizations_test.rb
index 1a94a1c5e..f97585ce0 100644
--- a/test/system/university/organizations_test.rb
+++ b/test/system/university/organizations_test.rb
@@ -22,7 +22,7 @@ class University::OrganizationsTest < ApplicationSystemTestCase
fill_in "Kind", with: @university_organization.kind
fill_in "Mail", with: @university_organization.mail
fill_in "Phone", with: @university_organization.phone
- fill_in "Sirene", with: @university_organization.sirene
+ fill_in "Siren", with: @university_organization.siren
fill_in "Title", with: @university_organization.title
fill_in "Website", with: @university_organization.website
fill_in "Zipcode", with: @university_organization.zipcode
@@ -44,7 +44,7 @@ class University::OrganizationsTest < ApplicationSystemTestCase
fill_in "Kind", with: @university_organization.kind
fill_in "Mail", with: @university_organization.mail
fill_in "Phone", with: @university_organization.phone
- fill_in "Sirene", with: @university_organization.sirene
+ fill_in "Siren", with: @university_organization.siren
fill_in "Title", with: @university_organization.title
fill_in "Website", with: @university_organization.website
fill_in "Zipcode", with: @university_organization.zipcode
--
GitLab