diff options
| author | jessib <jessib@riseup.net> | 2014-01-21 10:17:35 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2014-01-21 10:17:35 -0800 |
| commit | 77520ca1d1d6f932bb6d56f48effcadf4b623802 (patch) | |
| tree | b81a23251048848a68c559456e9581b4e8799aca /core | |
| parent | a19d01313ac534bdbbd8381593f887f1f77c94d5 (diff) | |
| parent | 8c087dc69174a5fbd9390b5c3a795fd0f56f6ed2 (diff) | |
Merge branch 'develop' into feature/messages_api
Diffstat (limited to 'core')
| -rw-r--r-- | core/app/views/common/_download_for_os.html.haml | 9 | ||||
| -rw-r--r-- | core/config/initializers/couchrest_model.rb | 3 | ||||
| -rw-r--r-- | core/config/locales/en.yml | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/core/app/views/common/_download_for_os.html.haml b/core/app/views/common/_download_for_os.html.haml index 4c096ce..3a11d10 100644 --- a/core/app/views/common/_download_for_os.html.haml +++ b/core/app/views/common/_download_for_os.html.haml @@ -3,10 +3,11 @@ %span.link - btn_class = (os == "other") ? "disabled" : "btn-primary" = link_to client_download_url(os), :class => "btn btn-large #{btn_class}" do - .pull-left= huge_icon('mask') - = t(:download_client) - %br/ - %small= I18n.t("os.#{os}") + = big_icon('download') + .pull-right + = t(:download_client) + %br/ + %small= I18n.t("os.#{os}") %span.info %div= t(:client_info, :provider => content_tag(:b,APP_CONFIG[:domain])).html_safe %div diff --git a/core/config/initializers/couchrest_model.rb b/core/config/initializers/couchrest_model.rb new file mode 100644 index 0000000..ce4f41a --- /dev/null +++ b/core/config/initializers/couchrest_model.rb @@ -0,0 +1,3 @@ +CouchRest::Model::Base.configure do |config| + config.auto_update_design_doc = false +end diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml index 4abf4e8..bb510d4 100644 --- a/core/config/locales/en.yml +++ b/core/config/locales/en.yml @@ -33,8 +33,9 @@ en: os: linux32: "Linux (32 bit)" linux64: "Linux (64 bit)" + linux: "GNU/Linux" windows: "Windows" android: "Android" osx: "Mac OS" - other: "(not available for your OS.)" + other: "(not available for your OS)" |