From a02f2f67e247a2330182d211a7f9b65dd78e0826 Mon Sep 17 00:00:00 2001 From: Carl Chenet Date: Tue, 16 Oct 2018 18:57:47 +0200 Subject: [PATCH] translate error for mandatory tag(s) --- app/models/story.rb | 4 +--- config/locales/en.yml | 1 + config/locales/fr.yml | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/story.rb b/app/models/story.rb index d390474..d3dab23 100644 --- a/app/models/story.rb +++ b/app/models/story.rb @@ -276,9 +276,7 @@ class Story < ActiveRecord::Base if !self.taggings.reject{|t| t.marked_for_destruction? || t.tag.is_media? }.any? - errors.add(:base, "Must have at least one non-media (PDF, video) " << - "tag. If no tags apply to your content, it probably doesn't " << - "belong here.") + errors.add(:base, I18n.t( 'models.story.nonmedia')) end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 60c701e..9edaa7e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -40,6 +40,7 @@ en: mergedinto: "merged into %{shortid} (%{title})" unmerged: "unmerged from another story" changedfromto: "changed %{story} from %{stfrom} to %{stto}" + nonmedia: "Must have at least one non-media (PDF, video) tag. If no tags apply to your content, it probably doesn't belong here." vote: offtopicvote: "Off-topic" incorrectvote: "Incorrect" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 9a9231f..d42fa72 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -52,6 +52,7 @@ fr: mergedinto: "mergée avec %{shortid} (%{title})" unmerged: "dé-fusionnée depuis une autre info" changedfromto: "%{story} changée de %{stfrom} à %{stto}" + nonmedia: "Une étiquette autre que PDF ou video doit être présente" vote: offtopicvote: "Hors-sujet" incorrectvote: "Incorrecte"