From e7c153df4ef1bd56966872572601fb919258217f Mon Sep 17 00:00:00 2001 From: UserAd Date: Thu, 30 Sep 2010 04:56:16 +0800 Subject: [PATCH 1/3] Add translation support in profile ('or' between buttons). Fix Russian locale --- app/views/users/_profile.haml | 2 +- config/locales/diaspora/en.yml | 1 + config/locales/diaspora/ru.yml | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/views/users/_profile.haml b/app/views/users/_profile.haml index 2b26eead0..774f3a094 100644 --- a/app/views/users/_profile.haml +++ b/app/views/users/_profile.haml @@ -50,7 +50,7 @@ #submit_block = link_to t('.cancel'), root_path - or + = t('.or') = f.submit t('.update_profile') #content_bottom diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 838339641..5595c4caa 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -113,6 +113,7 @@ en: albums: "Albums" you_dont_have_any_photos: "You don't have any photos! Go to the" page_to_upload_some: "page to upload some." + or: "or" comments: comment: ago: "ago" diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml index daeb35915..c4c1f32cc 100644 --- a/config/locales/diaspora/ru.yml +++ b/config/locales/diaspora/ru.yml @@ -66,7 +66,10 @@ ru: add_a_new_aspect: "Добавить аспект" create: "Создать" create: - success:"Нажмите на плюс слева, для того, что-бы указать Diaspora тех, кто может видеть ваш новый аспект." + success:"Нажмите на плюс слева, для того, что-бы указать Diaspora тех, кто может видеть ваш новый аспект + helper: + remove: "Удалить" + aspect_not_empty: "Аспект не пуст" users: edit: editing_profile: "Редактирование профиля" @@ -79,8 +82,9 @@ ru: picture: "Аватар" editing_profile: "Редактирование профиля" albums: "Альбомы" - you_dont_have_any_photos: "У вас нет ни одной фотографии! Перейдите на " - page_to_upload_some: "страницу для загрузки." + you_dont_have_any_photos: "У вас нет ни одной фотографии! Перейдите в" + page_to_upload_some: "для загрузки." + or: "или" comments: comment: ago: "ранее" From 1d0a4579f6b64361e5921e74021ae80987f5baaf Mon Sep 17 00:00:00 2001 From: UserAd Date: Thu, 30 Sep 2010 05:17:33 +0800 Subject: [PATCH 2/3] Add missing localization for aspect managment --- config/locales/diaspora/ru.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml index c4c1f32cc..f432c82d6 100644 --- a/config/locales/diaspora/ru.yml +++ b/config/locales/diaspora/ru.yml @@ -146,3 +146,18 @@ ru: save: "сохранить" are_you_sure: "Вы уверены?" remove_friend: "удалить друга" + requests: + new_request: + add_a_new_friend_to: "добавить нового друга к" + enter_a_diaspora_username: "Введите имя пользователя Diaspora:" + your_diaspora_username_is: "Ваше имя пользователя Diaspora: %{diaspora_handle}" + friends_username: "Имя пользователя друга" + destroy: + success: "Теперь вы друзья." + error: "Выберите аспект!" + ignore: "Игнорированные запросы дружбы." + create: + error: "Для этого адреса не найдено семя Diaspora!" + already_friends: "Вы уже друзья с %{destination_url}!" + success: "Запрос на дружбу выслан к %{destination_url}." + horribly_wrong: "Что-то пошло совсем не так." From 37fb2bfd3222d065b8a43b8adb1436adc582faff Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 5 Oct 2010 16:57:22 -0700 Subject: [PATCH 3/3] Don't require a facebook yml --- Gemfile.lock | 10 ---------- app/views/users/_services.haml | 25 +++++++++++++------------ config/environment.rb | 16 +++++++++------- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 44d386e33..5ae63f097 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,7 +116,6 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) selenium-webdriver (>= 0.0.3) - columnize (0.3.1) crack (0.1.8) cucumber (0.9.0) builder (~> 2.1.2) @@ -152,7 +151,6 @@ GEM i18n (0.4.1) json (1.4.6) json_pure (1.4.6) - linecache (0.43) mail (2.2.6.1) activesupport (>= 2.3.6) mime-types @@ -201,7 +199,6 @@ GEM rake (>= 0.8.4) thor (~> 0.14.0) rake (0.8.7) - redgreen (1.2.2) rest-client (1.6.1) mime-types (>= 1.16) rspec (2.0.0.beta.22) @@ -217,11 +214,6 @@ GEM rspec-rails (2.0.0.beta.17) rspec (>= 2.0.0.beta.14) webrat (>= 0.7.0) - ruby-debug (0.10.3) - columnize (>= 0.1) - ruby-debug-base (~> 0.10.3.0) - ruby-debug-base (0.10.3) - linecache (>= 0.3) rubyzip (0.9.4) selenium-webdriver (0.0.28) ffi (>= 0.6.1) @@ -278,11 +270,9 @@ DEPENDENCIES pubsubhubbub rails (= 3.0.0) redfinger! - redgreen roxml! rspec (>= 2.0.0.beta.17) rspec-rails (= 2.0.0.beta.17) - ruby-debug sprinkle! thin webmock diff --git a/app/views/users/_services.haml b/app/views/users/_services.haml index f2d976a79..fd1894d11 100644 --- a/app/views/users/_services.haml +++ b/app/views/users/_services.haml @@ -5,19 +5,20 @@ %h2 Services -%h3 Facebook -%p - - if @logged_in - = connected_fb_as(@access_token) - - %p - - @fb_friends = MiniFB.get(@access_token, 'me', :type => "friends") - - @fb_friends[:data].each do |friend| - = image_tag( "http://graph.facebook.com/#{friend[:id]}/picture" ) +- if FACEBOOK + %h3 Facebook + %p + - if @logged_in + = connected_fb_as(@access_token) + + %p + - @fb_friends = MiniFB.get(@access_token, 'me', :type => "friends") + - @fb_friends[:data].each do |friend| + = image_tag( "http://graph.facebook.com/#{friend[:id]}/picture" ) - = link_to "Disconnect from Facebook", services_destroy_path - - else - = link_to "Connect to Facebook (DO NOT USE WITH A REAL ACCOUNT)", @fb_access_url + = link_to "Disconnect from Facebook", services_destroy_path + - else + = link_to "Connect to Facebook (DO NOT USE WITH A REAL ACCOUNT)", @fb_access_url #content_bottom .back diff --git a/config/environment.rb b/config/environment.rb index 6b960209f..7fff237bd 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -7,13 +7,15 @@ require File.expand_path('../application', __FILE__) Haml::Template.options[:format] = :html5 Haml::Template.options[:escape_html] = true -# Load facebook connection application credentials -fb_config = YAML::load(File.open(File.expand_path("./config/fb_config.yml"))) -FB_API_KEY = fb_config['fb_api_key'] -FB_SECRET = fb_config['fb_secret'] -FB_APP_ID = fb_config['fb_app_id'] -HOST = fb_config['host'] - +if File.exists?(File.expand_path("./config/fb_config.yml")) + # Load facebook connection application credentials + fb_config = YAML::load(File.open(File.expand_path("./config/fb_config.yml"))) + FB_API_KEY = fb_config['fb_api_key'] + FB_SECRET = fb_config['fb_secret'] + FB_APP_ID = fb_config['fb_app_id'] + HOST = fb_config['host'] + FACEBOOK = true +end # Initialize the rails application Diaspora::Application.initialize!