Remove superfluous "language" from diary strings - it sounds weird (other option...

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 2599bd479dd24ec15e901d042913da3297996ac4..d3601d47b70298d827a06eed0929e2b40b9f11be 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -102,7 +102,7 @@ class DiaryEntryController < ApplicationController
         :conditions => ["users.visible = ? AND diary_entries.language_code = ?", true, params[:language]],
         :order => 'created_at DESC', :limit => 20)
       @title = "OpenStreetMap diary entries in #{Language.find(params[:language]).english_name}"
-      @description = "Recent diary entries from users of OpenStreetMap in #{Language.find(params[:language]).english_name} language"
+      @description = "Recent diary entries from users of OpenStreetMap in #{Language.find(params[:language]).english_name}"
       @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
     else
       @entries = DiaryEntry.find(:all, :include => :user,

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b8a4955d4c29247d756715a1f5426ced73f5d74a..e41f5e68cc7f8d9c89048c5c9db30080ce9c90c1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -247,7 +247,7 @@ en:
     list:
       title: "Users' diaries"
       user_title: "{{user}}'s diary"
-      in_language_title: "Diary entries in {{language}} language"
+      in_language_title: "Diary Entries in {{language}}"
       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries