IE7 specific fixes / Refreshed translations

schacon · Mar 16, 2009 · 1d42510 · 1d42510
1 parent 80118e8
commit 1d42510
Show file tree

Hide file tree

Showing 13 changed files with 105 additions and 82 deletions.
diff --git a/app/helpers/format_helper.rb b/app/helpers/format_helper.rb
@@ -59,10 +59,7 @@ def markup_editor(name, method, options = {}, html_options = {})
 
     def links_for_markup_editor(element_id)
       markup_link = link_to _('Markup reference'), markup_reference_path,
-        :popup => [
-          _('Markup reference'), 
-          'height=400,width=800,location=0,status=0,menubar=0,resizable=1,scrollbars=1'
-        ]    
+        :popup => [_('Reference'), 'height=400,width=800,location=0,status=0,menubar=0,resizable=1,scrollbars=1']    
       preview_link = link_to_remote _('Preview'), 
         :url => markup_preview_path,
         :with => "'content=' + encodeURIComponent($F('#{element_id}')) + '&element_id=#{element_id}_preview'",

diff --git a/app/views/layouts/_top.html.erb b/app/views/layouts/_top.html.erb
@@ -11,9 +11,8 @@
 
 <%= stylesheet_link_tag 'lib', 'ext', 'res/positioning', 'res/forms', 'res/classes', 'res/tables', 'res/rails',
       'app/admin', 'app/browse', 'app/changesets', 'app/milestones', 'app/tickets', 'app/search', 'app/rss', :cache => true %>  
-<!--[if IE]><%= stylesheet_link_tag 'ie' %><![endif]-->
+<!--[if lte IE 7]><%= stylesheet_link_tag 'ie' %><![endif]-->
 
-<%#= javascript_include_tag "date/#{I18n.locale}" %>
 <%= javascript_include_tag 'prototype', 'effects', 'controls', 'dragdrop','application', 'sha1', :cache => true %>
 
 <%= layout_markers[:header] %>

diff --git a/app/views/rescue/403.html.erb b/app/views/rescue/403.html.erb
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
@@ -20,7 +20,7 @@
     <% end -%>
 
   <% end -%>
-  <hr space="true"/>
+  <hr class="space"/>
 
   <% if @results.any? -%>
     <%= render :partial => 'result', :collection => @results %>

diff --git a/app/views/tickets/form/_summary_and_description.html.erb b/app/views/tickets/form/_summary_and_description.html.erb
@@ -1,10 +1,9 @@
 <% f.fieldset do -%>
-  <div class="break">
-    <%= f.label :summary, _('Summary') + ':', :required => true %>
-    <%= f.text_field :summary, :wrap_options => {:class => 'full-w'} %>
-  </div>
-  <div class="break">
+  <%= f.label :summary, _('Summary') + ':', :required => true %>
+  <%= f.text_field :summary, :wrap_options => {:class => 'full-w'} %>
+<% end -%>
+
+<% f.fieldset do -%>
     <%= f.label_tag _('Description'), :required => true %>
     <%= markup_area :ticket, :content %>
-  </div>
 <% end -%>
diff --git a/locales/app/de-DE.yml b/locales/app/de-DE.yml
@@ -18,12 +18,9 @@ de-DE:
     # app/views/admin/projects/_project.html.erb
     "ATTENTION: Are you really sure, that you want to delete this project?": "ACHTUNG: Möchten Sie wirklich das Projekt löschen?"
 
-    # app/views/admin/users/_form.html.erb
+    # app/views/admin/users/_groups.html.erb
     "ATTENTION: Group settings will be ignored if the 'Administrator' option is selected!": "ACHTUNG! Gruppeneinstellungen werden ignoriert, wenn gleichzeitig die 'Administrator'-Option gewählt wurde!"
 
-    # app/views/rescue/403.html.erb
-    "Access forbidden (403)": 
-
     # app/models/notifications.rb
     "Account activation": "Aktivierung des Benutzerkontos"
 
@@ -73,7 +70,7 @@ de-DE:
 
     # app/controllers/projects_controller.rb
     # app/views/rss/_all.html.erb
-    "All Projects": 
+    "All Projects": Alle Projekte 
 
     # app/views/rss/_feed.html.erb
     "All feeds for {{project}}": 
@@ -82,7 +79,7 @@ de-DE:
     "All feeds from all projects": 
 
     # app/models/status.rb
-    "All in progress": "All in Bearbetung"
+    "All in progress": "Alle in Bearbetung"
 
     # app/controllers/projects_controller.rb
     "All news for all projects": 
@@ -211,10 +208,11 @@ de-DE:
     # app/helpers/format_helper.rb
     "Close preview": "Vorschau schließen"
 
+    # app/helpers/milestones_helper.rb
     # app/views/admin/projects/_form.html.erb
     "Closed": "Geschlossen"
 
-    # app/views/milestones/_milestone.html.erb
+    # Unknown
     "Closed tickets": "Geschlossene Tickets"
 
     # app/core_info.rb
@@ -490,7 +488,7 @@ de-DE:
     # app/views/admin/dashboard/index.html.erb
     # app/views/admin/groups/_header.html.erb
     # app/views/admin/groups/index.html.erb
-    # app/views/admin/users/_form.html.erb
+    # app/views/admin/users/_groups.html.erb
     # app/views/admin/users/index.html.erb
     "Groups": "Gruppen"
 
@@ -504,7 +502,6 @@ de-DE:
     "Hide already completed milestones": "Abgeschlossene Meilensteine nicht anzeigen"
 
     # app/views/layouts/_header.html.erb
-    # app/views/rescue/403.html.erb
     # app/views/rescue/404.html.erb
     # app/views/rescue/422.html.erb
     # app/views/rescue/500.html.erb
@@ -519,6 +516,7 @@ de-DE:
     # app/views/tickets/index.html.erb
     "ID": "ID"
 
+    # app/helpers/milestones_helper.rb
     # app/models/status.rb
     "In progress": "In Bearbeitung"
 
@@ -711,10 +709,11 @@ de-DE:
     # app/views/admin/users/edit.html.erb
     "Notify user on account activation": "Benutzer bei aktivierung des Benutzerkontos benachrichtingen"
 
+    # app/helpers/milestones_helper.rb
     # app/models/status.rb
     "Open": "Geöffnet"
 
-    # app/views/milestones/_milestone.html.erb
+    # Unknown
     "Open tickets": "Offene Tickets"
 
     # app/views/accounts/show.html.erb
@@ -852,6 +851,9 @@ de-DE:
     # app/views/tickets/_ticket_intro.html.erb
     "Really delete ticket?": "Soll das Ticket wirklich gelöscht werden?"
 
+    # app/helpers/format_helper.rb
+    "Reference": 
+
     # vendor/plugins/wiki_engine/lib/wiki_engines.rb
     "References": "Verweise"
 
@@ -1095,6 +1097,7 @@ de-DE:
     # app/controllers/tickets_controller.rb
     # app/core_info.rb
     # app/models/ticket.rb
+    # app/views/milestones/_milestone.html.erb
     # app/views/tickets/index.html.erb
     "Tickets": "Tickets"
 
@@ -1177,6 +1180,7 @@ de-DE:
 
     # app/views/accounts/activate.html.erb
     # app/views/admin/users/_core.html.erb
+    # app/views/admin/users/edit.html.erb
     # app/views/notifications/account_activation_note.html.erb
     # app/views/notifications/account_validation.html.erb
     "Username": "Benutzername"
@@ -1233,7 +1237,7 @@ de-DE:
     # app/controllers/accounts_controller.rb
     "You are not allowed to login until your account has been activated by the administrator.": "Sie können sich leider nicht anmelden, bis ein Administrator Ihr Konto aktiviert hat."
 
-    # app/views/rescue/403.html.erb
+    # Unknown
     "You are not permitted to view this page.": 
 
     # app/views/sessions/destroy.html.erb

diff --git a/locales/app/en-GB.yml b/locales/app/en-GB.yml
@@ -18,12 +18,9 @@ en-GB:
     # app/views/admin/projects/_project.html.erb
     "ATTENTION: Are you really sure, that you want to delete this project?": "ATTENTION: Are you really sure, that you want to delete this project?"
 
-    # app/views/admin/users/_form.html.erb
+    # app/views/admin/users/_groups.html.erb
     "ATTENTION: Group settings will be ignored if the 'Administrator' option is selected!": "ATTENTION: Group settings will be ignored if the 'Administrator' option is selected!"
 
-    # app/views/rescue/403.html.erb
-    "Access forbidden (403)": 
-
     # app/models/notifications.rb
     "Account activation": "Account activation"
 
@@ -211,10 +208,11 @@ en-GB:
     # app/helpers/format_helper.rb
     "Close preview": "Close preview"
 
+    # app/helpers/milestones_helper.rb
     # app/views/admin/projects/_form.html.erb
     "Closed": "Closed"
 
-    # app/views/milestones/_milestone.html.erb
+    # Unknown
     "Closed tickets": "Closed tickets"
 
     # app/core_info.rb
@@ -490,7 +488,7 @@ en-GB:
     # app/views/admin/dashboard/index.html.erb
     # app/views/admin/groups/_header.html.erb
     # app/views/admin/groups/index.html.erb
-    # app/views/admin/users/_form.html.erb
+    # app/views/admin/users/_groups.html.erb
     # app/views/admin/users/index.html.erb
     "Groups": "Groups"
 
@@ -504,7 +502,6 @@ en-GB:
     "Hide already completed milestones": "Hide already completed milestones"
 
     # app/views/layouts/_header.html.erb
-    # app/views/rescue/403.html.erb
     # app/views/rescue/404.html.erb
     # app/views/rescue/422.html.erb
     # app/views/rescue/500.html.erb
@@ -519,6 +516,7 @@ en-GB:
     # app/views/tickets/index.html.erb
     "ID": "ID"
 
+    # app/helpers/milestones_helper.rb
     # app/models/status.rb
     "In progress": "In progress"
 
@@ -609,7 +607,7 @@ en-GB:
     "Markup reference": "Markup reference"
 
     # app/views/rescue/422.html.erb
-    "Maybe you tried to change something you didn't have access to.": 
+    "Maybe you tried to change something you didn't have access to.": "Maybe you tried to change something you didn't have access to." 
 
     # app/helpers/tickets_helper.rb
     # app/models/milestone.rb
@@ -711,10 +709,11 @@ en-GB:
     # app/views/admin/users/edit.html.erb
     "Notify user on account activation": "Notify user on account activation"
 
+    # app/helpers/milestones_helper.rb
     # app/models/status.rb
     "Open": "Open"
 
-    # app/views/milestones/_milestone.html.erb
+    # Unknown
     "Open tickets": "Open tickets"
 
     # app/views/accounts/show.html.erb
@@ -725,7 +724,7 @@ en-GB:
     "Options": "Options"
 
     # vendor/plugins/wiki_engine/lib/wiki_engines.rb
-    "Paragraphs": 
+    "Paragraphs": "Paragraphs" 
 
     # app/views/admin/users/_core.html.erb
     # app/views/sessions/new.html.erb
@@ -855,6 +854,9 @@ en-GB:
     # app/views/tickets/_ticket_intro.html.erb
     "Really delete ticket?": "Really delete ticket?"
 
+    # app/helpers/format_helper.rb
+    "Reference": 
+
     # vendor/plugins/wiki_engine/lib/wiki_engines.rb
     "References": 
 
@@ -1098,6 +1100,7 @@ en-GB:
     # app/controllers/tickets_controller.rb
     # app/core_info.rb
     # app/models/ticket.rb
+    # app/views/milestones/_milestone.html.erb
     # app/views/tickets/index.html.erb
     "Tickets": "Tickets"
 
@@ -1180,6 +1183,7 @@ en-GB:
 
     # app/views/accounts/activate.html.erb
     # app/views/admin/users/_core.html.erb
+    # app/views/admin/users/edit.html.erb
     # app/views/notifications/account_activation_note.html.erb
     # app/views/notifications/account_validation.html.erb
     "Username": "Username"
@@ -1236,7 +1240,7 @@ en-GB:
     # app/controllers/accounts_controller.rb
     "You are not allowed to login until your account has been activated by the administrator.": "You are not allowed to login until your account has been activated by the administrator."
 
-    # app/views/rescue/403.html.erb
+    # Unknown
     "You are not permitted to view this page.": 
 
     # app/views/sessions/destroy.html.erb

diff --git a/locales/app/ja-JP.yml b/locales/app/ja-JP.yml
@@ -18,10 +18,10 @@ ja-JP:
     # app/views/admin/projects/_project.html.erb
     "ATTENTION: Are you really sure, that you want to delete this project?": "注意: 本当にこのプロジェクトを削除したいですか？"
 
-    # app/views/admin/users/_form.html.erb
+    # app/views/admin/users/_groups.html.erb
     "ATTENTION: Group settings will be ignored if the 'Administrator' option is selected!": "注意: '管理者'オプションを選択している場合はグループの設定は無視されます！"
 
-    # app/views/rescue/403.html.erb
+    # Unknown
     "Access forbidden (403)": 
 
     # app/models/notifications.rb
@@ -211,10 +211,11 @@ ja-JP:
     # app/helpers/format_helper.rb
     "Close preview": "プレビューを閉じる"
 
+    # app/helpers/milestones_helper.rb
     # app/views/admin/projects/_form.html.erb
     "Closed": "閉鎖"
 
-    # app/views/milestones/_milestone.html.erb
+    # Unknown
     "Closed tickets": "解決済みチケット数"
 
     # app/core_info.rb
@@ -490,7 +491,7 @@ ja-JP:
     # app/views/admin/dashboard/index.html.erb
     # app/views/admin/groups/_header.html.erb
     # app/views/admin/groups/index.html.erb
-    # app/views/admin/users/_form.html.erb
+    # app/views/admin/users/_groups.html.erb
     # app/views/admin/users/index.html.erb
     "Groups": "グループ一覧"
 
@@ -504,7 +505,6 @@ ja-JP:
     "Hide already completed milestones": "完了したマイルストーンを隠す"
 
     # app/views/layouts/_header.html.erb
-    # app/views/rescue/403.html.erb
     # app/views/rescue/404.html.erb
     # app/views/rescue/422.html.erb
     # app/views/rescue/500.html.erb
@@ -519,6 +519,7 @@ ja-JP:
     # app/views/tickets/index.html.erb
     "ID": 
 
+    # app/helpers/milestones_helper.rb
     # app/models/status.rb
     "In progress": "進行中"
 
@@ -711,10 +712,11 @@ ja-JP:
     # app/views/admin/users/edit.html.erb
     "Notify user on account activation": "アカウント有効化時にユーザに通知する"
 
+    # app/helpers/milestones_helper.rb
     # app/models/status.rb
     "Open": "未解決"
 
-    # app/views/milestones/_milestone.html.erb
+    # Unknown
     "Open tickets": "未解決チケット数"
 
     # app/views/accounts/show.html.erb
@@ -852,6 +854,9 @@ ja-JP:
     # app/views/tickets/_ticket_intro.html.erb
     "Really delete ticket?": 
 
+    # app/helpers/format_helper.rb
+    "Reference": 
+
     # vendor/plugins/wiki_engine/lib/wiki_engines.rb
     "References": 
 
@@ -1095,6 +1100,7 @@ ja-JP:
     # app/controllers/tickets_controller.rb
     # app/core_info.rb
     # app/models/ticket.rb
+    # app/views/milestones/_milestone.html.erb
     # app/views/tickets/index.html.erb
     "Tickets": "チケット一覧"
 
@@ -1177,6 +1183,7 @@ ja-JP:
 
     # app/views/accounts/activate.html.erb
     # app/views/admin/users/_core.html.erb
+    # app/views/admin/users/edit.html.erb
     # app/views/notifications/account_activation_note.html.erb
     # app/views/notifications/account_validation.html.erb
     "Username": "ユーザ名"
@@ -1233,7 +1240,7 @@ ja-JP:
     # app/controllers/accounts_controller.rb
     "You are not allowed to login until your account has been activated by the administrator.": "管理者があなたのアカウントを有効化するまでログインできません。"
 
-    # app/views/rescue/403.html.erb
+    # Unknown
     "You are not permitted to view this page.": 
 
     # app/views/sessions/destroy.html.erb