adds localization for flash messages

steinerl · steinerl · commit d6dd09af64a6 · 2013-05-10T22:46:06.000+02:00
diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
@@ -26,13 +26,13 @@ class Stringer < Sinatra::Base
     if feed and feed.valid?
       FetchFeeds.enqueue([feed])
 
-      flash[:success] = "We've added your new feed. Check back in a bit."
+      flash[:success] = t('feeds.add.flash.added_successfully')
       redirect to("/")
     elsif feed
-      flash.now[:error] = "You are already subscribed to this feed..."
+      flash.now[:error] = t('feeds.add.flash.already_subscribed_error')
       erb :'feeds/add'
     else
-      flash.now[:error] = "We couldn't find that feed. Try again."
+      flash.now[:error] = t('feeds.add.flash.feed_not_found_error')
       erb :'feeds/add'
     end
   end
diff --git a/app/controllers/first_run_controller.rb b/app/controllers/first_run_controller.rb
@@ -19,7 +19,7 @@ class Stringer < Sinatra::Base
 
     post "/password" do
       if no_password(params) or password_mismatch?(params)
-        flash.now[:error] = "Hey, your password confirmation didn't match. Try again."
+        flash.now[:error] = t('first_run.password.flash.passwords_dont_match')
         erb :"first_run/password"
       else
         user = CreateUser.new.create(params[:password])
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
@@ -12,13 +12,13 @@ class Stringer < Sinatra::Base
 
       redirect to("/")
     else
-      flash.now[:error] = "That's the wrong password. Try again."
+      flash.now[:error] = t('sessions.new.flash.wrong_password')
       erb :"sessions/new"
     end
   end
 
   get "/logout" do
-    flash[:success] = "You have been signed out!"
+    flash[:success] = t('sessions.destroy.flash.logged_out_successfully')
     session[:user_id] = nil
 
     redirect to("/")
diff --git a/app/views/stories/news.json.rabl b/app/views/stories/news.json.rabl
@@ -0,0 +1,3 @@
+collection @unread_stories, :root => "stories"
+attributes :id, :title, :permalink, :body, :published
+child(:feed) { attributes :name, :url }
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -6,6 +6,10 @@ en:
       fields:
         feed_url: "Feed URL"
         submit: "Add"
+      flash:
+        added_successfully: "We've added your new feed. Check back in a bit."
+        already_subscribed_error: "You are already subscribed to this feed..."
+        feed_not_found_error: "We couldn't find that feed. Try again."
     index:
       add_some_feeds: "Hey, you should %{add} some feeds."
       add: "add"
@@ -19,6 +23,8 @@ en:
         password: "Password"
         password_confirmation: "Confirm"
         next: "Next"
+      flash:
+        passwords_dont_match: "Hey, your password confirmation didn't match. Try again."
   partials:
     action_bar:
       mark_all: "Mark all as read"
@@ -51,6 +57,11 @@ en:
       fields:
         password: "Password"
         submit: "Login"
+      flash:
+        wrong_password: "That's the wrong password. Try again."
+    destroy:
+      flash:
+        logged_out_successfully: "You have been signed out!"
   import:
     title: "Welcome aboard."
     subtitle: "Let's setup your feeds."

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+collection @unread_stories, :root => "stories"`
	`2`	`+attributes :id, :title, :permalink, :body, :published`
	`3`	`+child(:feed) { attributes :name, :url }`