From 3f382391c76388255dc9bb5136c229a242255b6b Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Sat, 23 Apr 2016 12:54:39 +0200
Subject: [PATCH] Better translation for GLUGs
---
config/locales/models/en.yml | 2 +-
config/locales/models/fr.yml | 2 +-
db/migrate/20150215172000_create_kinds.rb | 2 +-
db/schema.rb | 90 ++++++++++++-----------
4 files changed, 49 insertions(+), 47 deletions(-)
diff --git a/config/locales/models/en.yml b/config/locales/models/en.yml
index 5d1d85907..e17941bb4 100644
--- a/config/locales/models/en.yml
+++ b/config/locales/models/en.yml
@@ -55,7 +55,7 @@ en:
kind:
name_association: Association
name_enterprise: Enterprise
- name_lug: GLUG
+ name_glug: GLUG
name_provider: ISP
name_institution: Institution
name_lab: Lab
diff --git a/config/locales/models/fr.yml b/config/locales/models/fr.yml
index b152ca4af..155273f64 100644
--- a/config/locales/models/fr.yml
+++ b/config/locales/models/fr.yml
@@ -55,7 +55,7 @@ fr:
kind:
name_association: Association
name_enterprise: Entreprise
- name_lug: GULL
+ name_glug: GULL
name_provider: FAI
name_institution: Institution
name_lab: Lab
diff --git a/db/migrate/20150215172000_create_kinds.rb b/db/migrate/20150215172000_create_kinds.rb
index 3f39aa5ad..5d024111f 100644
--- a/db/migrate/20150215172000_create_kinds.rb
+++ b/db/migrate/20150215172000_create_kinds.rb
@@ -11,7 +11,7 @@ class CreateKinds < ActiveRecord::Migration
# Create the relevant organisation kinds
Kind.create name: 'association', icon: 'sitemap'
Kind.create name: 'enterprise', icon: 'building'
- Kind.create name: 'lug', icon: 'support'
+ Kind.create name: 'glug', icon: 'support'
Kind.create name: 'provider', icon: 'tty'
Kind.create name: 'institution', icon: 'institution'
end
diff --git a/db/schema.rb b/db/schema.rb
index 6be5c80a1..4c0e4abaf 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -24,9 +24,9 @@ ActiveRecord::Schema.define(version: 20160409131029) do
t.datetime "updated_at"
end
- add_index "active_admin_comments", ["author_type", "author_id"], name: "index_active_admin_comments_on_author_type_and_author_id", using: :btree
- add_index "active_admin_comments", ["namespace"], name: "index_active_admin_comments_on_namespace", using: :btree
- add_index "active_admin_comments", ["resource_type", "resource_id"], name: "index_active_admin_comments_on_resource_type_and_resource_id", using: :btree
+ add_index "active_admin_comments", ["author_type", "author_id"], name: "index_active_admin_comments_on_author_type_and_author_id"
+ add_index "active_admin_comments", ["namespace"], name: "index_active_admin_comments_on_namespace"
+ add_index "active_admin_comments", ["resource_type", "resource_id"], name: "index_active_admin_comments_on_resource_type_and_resource_id"
create_table "admin_users", force: :cascade do |t|
t.string "email", limit: 255, default: "", null: false
@@ -43,8 +43,8 @@ ActiveRecord::Schema.define(version: 20160409131029) do
t.datetime "updated_at"
end
- add_index "admin_users", ["email"], name: "index_admin_users_on_email", unique: true, using: :btree
- add_index "admin_users", ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true, using: :btree
+ add_index "admin_users", ["email"], name: "index_admin_users_on_email", unique: true
+ add_index "admin_users", ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true
create_table "cities", force: :cascade do |t|
t.string "name", limit: 255, default: "", null: false
@@ -56,7 +56,7 @@ ActiveRecord::Schema.define(version: 20160409131029) do
t.float "longitude", limit: 24
end
- add_index "cities", ["name"], name: "cities_name", using: :btree
+ add_index "cities", ["name"], name: "cities_name"
create_table "events", force: :cascade do |t|
t.string "title", limit: 255, default: "", null: false
@@ -72,8 +72,8 @@ ActiveRecord::Schema.define(version: 20160409131029) do
t.integer "moderated", limit: 4, default: 0, null: false
t.string "tags", limit: 255, default: "", null: false
t.string "secret", limit: 255, default: "", null: false
- t.datetime "decision_time", null: false
- t.datetime "submission_time", null: false
+ t.datetime "decision_time"
+ t.datetime "submission_time"
t.string "moderator_mail_id", limit: 32
t.string "submitter_mail_id", limit: 32
t.text "address", limit: 65535
@@ -83,13 +83,13 @@ ActiveRecord::Schema.define(version: 20160409131029) do
t.string "place_name", limit: 255
end
- add_index "events", ["start_time", "end_time"], name: "events_date", using: :btree
+ add_index "events", ["start_time", "end_time"], name: "events_date"
create_table "kinds", force: :cascade do |t|
- t.string "name", limit: 255, null: false
- t.string "icon", limit: 255
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.string "name", null: false
+ t.string "icon"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
create_table "notes", force: :cascade do |t|
@@ -100,64 +100,66 @@ ActiveRecord::Schema.define(version: 20160409131029) do
end
create_table "orgas", force: :cascade do |t|
- t.integer "region_id", limit: 4, default: 0, null: false
- t.string "department", limit: 255
- t.string "name", limit: 255, default: "", null: false
- t.string "url", limit: 255, default: "", null: false
- t.string "city", limit: 255, default: ""
+ t.integer "region_id", limit: 4, default: 0, null: false
+ t.string "department", limit: 4, default: "0", null: false
+ t.string "name", limit: 255, default: "", null: false
+ t.string "url", limit: 255, default: "", null: false
+ t.string "city", limit: 255, default: ""
t.integer "kind_id", limit: 4
t.string "feed", limit: 255
t.string "contact", limit: 255
t.string "submitter", limit: 255
- t.boolean "moderated", default: false
+ t.boolean "moderated", limit: 1, default: false
t.datetime "submission_time"
t.datetime "decision_time"
t.string "secret", limit: 255
- t.boolean "deleted", default: false, null: false
- t.boolean "active", default: true, null: false
- t.text "description", limit: 65535
+ t.boolean "deleted", limit: 1, default: false, null: false
+ t.boolean "active", default: true, null: false
+ t.text "description"
t.datetime "created_at"
t.datetime "updated_at"
- t.string "tags", limit: 255, default: ""
- t.text "diaspora", limit: 65535
- t.text "place_name", limit: 65535
- t.text "address", limit: 65535
- t.float "latitude", limit: 24
- t.float "longitude", limit: 24
+ t.text "tag"
+ t.text "tags", default: ""
+ t.text "diaspora"
+ t.text "object_changes"
+ t.text "place_name"
+ t.text "address"
+ t.float "latitude"
+ t.float "longitude"
end
- add_index "orgas", ["kind_id"], name: "index_orgas_on_kind_id", using: :btree
+ add_index "orgas", ["kind_id"], name: "index_orgas_on_kind_id"
create_table "regions", force: :cascade do |t|
t.string "name", limit: 255, default: "", null: false
end
create_table "taggings", force: :cascade do |t|
- t.integer "tag_id", limit: 4
- t.integer "taggable_id", limit: 4
+ t.integer "tag_id"
+ t.integer "taggable_id"
t.string "taggable_type", limit: 255
- t.integer "tagger_id", limit: 4
+ t.integer "tagger_id"
t.string "tagger_type", limit: 255
t.string "context", limit: 128
t.datetime "created_at"
end
- add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true, using: :btree
- add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree
+ add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true
+ add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
create_table "tags", force: :cascade do |t|
t.string "name", limit: 255
- t.integer "taggings_count", limit: 4, default: 0
+ t.integer "taggings_count", default: 0
end
- add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
+ add_index "tags", ["name"], name: "index_tags_on_name", unique: true
create_table "translations", force: :cascade do |t|
t.string "locale", limit: 255
t.string "key", limit: 255
t.text "value", limit: 65535
t.text "interpolations", limit: 65535
- t.boolean "is_proc", default: false
+ t.boolean "is_proc", limit: 1, default: false
end
create_table "users", force: :cascade do |t|
@@ -169,15 +171,15 @@ ActiveRecord::Schema.define(version: 20160409131029) do
end
create_table "versions", force: :cascade do |t|
- t.string "item_type", limit: 255, null: false
- t.integer "item_id", limit: 4, null: false
- t.string "event", limit: 255, null: false
- t.string "whodunnit", limit: 255
- t.text "object", limit: 65535
+ t.string "item_type", null: false
+ t.integer "item_id", null: false
+ t.string "event", null: false
+ t.string "whodunnit"
+ t.text "object"
t.datetime "created_at"
- t.text "object_changes", limit: 4294967295
+ t.text "object_changes", limit: 1073741823
end
- add_index "versions", ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id", using: :btree
+ add_index "versions", ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
end
--
GitLab