diff --git a/app/models/topic.rb b/app/models/topic.rb index 2fee8019fda..fdf606336cb 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -1,54 +1,3 @@ -# == Schema Information -# -# Table name: topics -# -# id :integer not null, primary key -# title :string(255) not null -# last_posted_at :datetime -# created_at :datetime not null -# updated_at :datetime not null -# views :integer default(0), not null -# posts_count :integer default(0), not null -# user_id :integer not null -# last_post_user_id :integer not null -# reply_count :integer default(0), not null -# featured_user1_id :integer -# featured_user2_id :integer -# featured_user3_id :integer -# avg_time :integer -# deleted_at :datetime -# highest_post_number :integer default(0), not null -# image_url :string(255) -# off_topic_count :integer default(0), not null -# like_count :integer default(0), not null -# incoming_link_count :integer default(0), not null -# bookmark_count :integer default(0), not null -# star_count :integer default(0), not null -# category_id :integer -# visible :boolean default(TRUE), not null -# moderator_posts_count :integer default(0), not null -# closed :boolean default(FALSE), not null -# archived :boolean default(FALSE), not null -# bumped_at :datetime not null -# has_best_of :boolean default(FALSE), not null -# meta_data :hstore -# vote_count :integer default(0), not null -# archetype :string(255) default("regular"), not null -# featured_user4_id :integer -# notify_moderators_count :integer default(0), not null -# spam_count :integer default(0), not null -# illegal_count :integer default(0), not null -# inappropriate_count :integer default(0), not null -# pinned_at :datetime -# score :float -# percent_rank :float default(1.0), not null -# notify_user_count :integer default(0), not null -# subtype :string(255) -# slug :string(255) -# auto_close_at :datetime -# auto_close_user_id :integer -# - require_dependency 'slug' require_dependency 'avatar_lookup' require_dependency 'topic_view' diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml index 991a11665ea..108237ca0b1 100644 --- a/config/locales/server.cs.yml +++ b/config/locales/server.cs.yml @@ -104,9 +104,6 @@ cs: post: raw: "Tělo" errors: - messages: - has_already_been_used: "již bylo použito" - is_invalid: "je neplatné; zkuste se vyjádřit více popisně" models: topic: attributes: diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml index ecf3d97bb6d..1c8a8ca8ea8 100644 --- a/config/locales/server.da.yml +++ b/config/locales/server.da.yml @@ -69,9 +69,6 @@ da: post: raw: "Brødtekst" errors: - messages: - has_already_been_used: "er allerede i brug" - is_invalid: "er ugyldig; prøv at være mere beskrivende" models: topic: attributes: diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index 98f5a5c89ed..f0852e53bd5 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -80,9 +80,6 @@ de: post: raw: "Hauptteil" errors: - messages: - has_already_been_used: "wurde schon benutzt" - is_invalid: "ist ungültig; bitte ein wenig anschaulicher" models: topic: attributes: diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 2d1cfc42c4b..be883eb7135 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -69,9 +69,6 @@ es: post: raw: "Body" errors: - messages: - has_already_been_used: "has already been used" - is_invalid: "is invalid; try to be a little more descriptive" models: topic: attributes: diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index e15c2f757b3..833f9b7f7c7 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -107,9 +107,6 @@ fr: post: raw: "Corps" errors: - messages: - has_already_been_used: "a déjà été utilisé" - is_invalid: "est invalide; essayez d'être plus précis" models: topic: attributes: diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml index 9246146f497..2dc03c92c8c 100644 --- a/config/locales/server.id.yml +++ b/config/locales/server.id.yml @@ -69,9 +69,6 @@ id: post: raw: "Body" errors: - messages: - has_already_been_used: "has already been used" - is_invalid: "is invalid; try to be a little more descriptive" models: topic: attributes: diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index 344799d7c98..280b3e9d4c2 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -100,9 +100,6 @@ it: post: raw: "Contenuto" errors: - messages: - has_already_been_used: "è già stato usato" - is_invalid: "non è valido; prova ad essere un po' più descrittivo" models: topic: attributes: diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml index 48a3ed31832..335d2d8c538 100644 --- a/config/locales/server.nl.yml +++ b/config/locales/server.nl.yml @@ -103,9 +103,6 @@ nl: post: raw: Inhoud errors: - messages: - has_already_been_used: is al eens gebruikt - is_invalid: "is niet geldig; probeer het iets beter te omschrijven" models: topic: attributes: @@ -436,8 +433,8 @@ nl: crawl_images: Zet het ophalen van afbeeldingen van externe bronnen aan ninja_edit_window: "Hoe snel je een aanpassing kan maken zonder dat er een nieuwe versie wordt opgeslagen, in seconden." enable_imgur: "Gebruik de imgur API voor uploads en sla afbeeldingen niet lokaal op" - imgur_client_id: "Je imgur.com client ID, nodig om afbeeldingen te kunnen uploaden naar imgur" - imgur_client_secret: "Je imgur.com client secret. Is nog niet nodig voor het uploaden van afbeeldingen, maar dat zou in de toekomst kunnen veranderen." + imgur_client_id: "Je imgur.com client ID, nodig om afbeeldingen te kunnen uploaden naar imgur" + imgur_client_secret: "Je imgur.com client secret. Is nog niet nodig voor het uploaden van afbeeldingen, maar dat zou in de toekomst kunnen veranderen." imgur_endpoint: "End point voor het uploaden van imgur.com-afbeeldingen" max_image_width: Maximale breedte voor een afbeelding in een bericht category_featured_topics: Aantal topics dat wordt weergegeven in de categorielijst diff --git a/config/locales/server.pseudo.yml b/config/locales/server.pseudo.yml index ddd24ba8a9f..bf22177dff0 100644 --- a/config/locales/server.pseudo.yml +++ b/config/locales/server.pseudo.yml @@ -83,10 +83,6 @@ pseudo: post: raw: '[[ Ɓóďý ]]' errors: - messages: - has_already_been_used: '[[ ĥáš áłřéáďý ƀééɳ ůšéď ]]' - is_invalid: '[[ íš íɳνáłíď; ťřý ťó ƀé á łíťťłé ɱóřé ďéščříƿťíνé ]]' - models: topic: attributes: diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index 38b514b43a2..72258944af3 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -56,9 +56,6 @@ pt: post: raw: "Corpo" errors: - messages: - has_already_been_used: "já foi usado" - is_invalid: "é inválido; tenta ser um bocado mais descritivo" models: topic: attributes: diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml index 4bbe0aebca5..507ed3f37c9 100644 --- a/config/locales/server.sv.yml +++ b/config/locales/server.sv.yml @@ -83,9 +83,6 @@ sv: post: raw: "Inlägg" errors: - messages: - has_already_been_used: "har redan använts" - is_invalid: "är otillåtet; försök att vara lite mer beskrivande" models: topic: attributes: diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 30c603733a7..46434ab43ed 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -89,9 +89,6 @@ zh_CN: post: raw: "内容" errors: - messages: - has_already_been_used: "已经被使用" - is_invalid: "无效，请描述得更清楚一点" models: topic: attributes: diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml index 7e9bd1aeca1..ee154a2d3e4 100644 --- a/config/locales/server.zh_TW.yml +++ b/config/locales/server.zh_TW.yml @@ -88,9 +88,6 @@ zh_TW: post: raw: "內容" errors: - messages: - has_already_been_used: "已經被使用" - is_invalid: "無效，請描述得更清楚一點" models: topic: attributes: