summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-11-15 11:53:21 +0100
committerAzul <azul@leap.se>2013-11-15 11:53:21 +0100
commit8b49ee15466b728213ec7f8bd4c8462876625acf (patch)
treec301a8033650a1067c9caf012669d1a47d6f2a0c /core
parent7e93258f552d6fd1114626561e6393aa483228fe (diff)
parent7a107e0d38271e7103d3494e06d52f3434022f22 (diff)
Merge branch 'develop'
Diffstat (limited to 'core')
-rw-r--r--core/app/helpers/download_helper.rb2
-rw-r--r--core/app/views/common/_download_for_os.html.haml4
-rw-r--r--core/app/views/common/_home_page_buttons.html.haml10
-rw-r--r--core/config/locales/en.yml4
4 files changed, 12 insertions, 8 deletions
diff --git a/core/app/helpers/download_helper.rb b/core/app/helpers/download_helper.rb
index f9c6c40..ee0fe73 100644
--- a/core/app/helpers/download_helper.rb
+++ b/core/app/helpers/download_helper.rb
@@ -2,7 +2,7 @@ module DownloadHelper
def alternative_client_links(os = nil)
alternative_clients(os).map do |client|
- link_to(client.capitalize, client_download_url(client))
+ link_to(I18n.t("os."+client), client_download_url(client))
end
end
diff --git a/core/app/views/common/_download_for_os.html.haml b/core/app/views/common/_download_for_os.html.haml
index b7c88ba..4c096ce 100644
--- a/core/app/views/common/_download_for_os.html.haml
+++ b/core/app/views/common/_download_for_os.html.haml
@@ -8,8 +8,8 @@
%br/
%small= I18n.t("os.#{os}")
%span.info
- = t(:client_info, :provider => content_tag(:b,APP_CONFIG[:domain])).html_safe
- %br/
+ %div= t(:client_info, :provider => content_tag(:b,APP_CONFIG[:domain])).html_safe
+ %div
- if os == "other"
= t(:all_downloads_info, :clients => alternative_client_links(os).to_sentence).html_safe
- else
diff --git a/core/app/views/common/_home_page_buttons.html.haml b/core/app/views/common/_home_page_buttons.html.haml
index e10fd38..3be12e2 100644
--- a/core/app/views/common/_home_page_buttons.html.haml
+++ b/core/app/views/common/_home_page_buttons.html.haml
@@ -2,10 +2,14 @@
.home-buttons
.row-fluid.first
- .span3
- .download.span6
+ .span2
+ .download.span8
= render partial: 'common/download_for_os', collection: available_clients + ['other']
- .span3
+ .span2
+ - if local_assigns[:divider]
+ .row-fluid
+ .span12
+ = render local_assigns[:divider]
.row-fluid.second
.login.span4
%span.link= link_to(icon('ok-sign', icon_color) + t(:login), login_path, :class => 'btn')
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 4710a16..4abf4e8 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -23,7 +23,7 @@ en:
download_client: "Download Bitmask"
client_info: "The Bitmask application allows you to use %{provider} services."
all_downloads_info: "It is available for %{clients}."
- other_downloads_info: "It is also available for %{clients}."
+ other_downloads_info: "Bitmask is also available for %{clients}."
login_info: "Log in to change your account settings, create support tickets, and manage payments."
signup_info: "Sign up for a new user account via this website (it is better if you use the Bitmask application to sign up, but this website works too)."
welcome: "Welcome to %{provider}."
@@ -35,6 +35,6 @@ en:
linux64: "Linux (64 bit)"
windows: "Windows"
android: "Android"
- osx: "Mac OSX"
+ osx: "Mac OS"
other: "(not available for your OS.)"