community_engine 2.3.2 → 3.0.0

data/config/locales/ja-JP.yml

@@ -19,12 +19,8 @@ ja:
         created_at: "created at: "
   #en: a_few_seconds_ago:  a few seconds ago
   a_few_seconds_ago:  数秒前
-  #en: about: About
-  about: About
   #en: about_me: About Me
   about_me: 自己紹介
-  #en: about_site: About %{site}
-  about_site: "%{site}について"
   #en: about_you: About You
   about_you: About You
   #en: accept: Accept
@@ -405,10 +401,6 @@ ja:
   explore_site: "Explore %{site}"
   #en: failed: failed
   failed: failed
-  #en: faq: FAQ
-  faq: よくある質問
-  #en: faq_section: FAQ section
-  faq_section: FAQ section
   #en: favorites: Favorites
   favorites: Favorites
   #en: favorite_this: Favorite this
@@ -483,8 +475,6 @@ ja:
   get_started_upload_a_profile_photo: "Get Started: Upload a profile photo"
   #en: go: Go
   go: Go
-  #en: go2: Go
-  go2: Go
   #en: go_check_your_e_mail: Go check your e-mail!
   go_check_your_e_mail: Go check your e-mail!
   #en: go_to_the_forums: go to the forums
@@ -611,8 +601,6 @@ ja:
   make_this_my_profile_photo: Make this my profile photo
   #en: male: 
   male: 男性
-  #en: manage_my: "Manage my:"
-  manage_my: "Manage my:"
   #en: manage_posts: Manage Posts
   manage_posts: Manage Posts
   #en: medium: Medium
@@ -653,8 +641,6 @@ ja:
   month: 月
   #en: more: More
   more: More
-  #en: more_about_you: More about you
-  more_about_you: More about you
   #en: most_active_1_month: Most active (1 month)
   most_active_1_month: Most active (1 month)
   #en: my_details: My Details
@@ -693,8 +679,8 @@ ja:
   new_invitation_from: New Invitation from
   #en: new_metro_area: New Metro Area
   new_metro_area: New Metro Area
-  #en: new_photo: New photo.
-  new_photo: New photo.
+  #en: new_photo: New photo
+  new_photo: New photo
   #en: new_photos_multiple_uploader: "New Photos » Multiple Uploader"
   new_photos_multiple_uploader: "New Photos » Multiple Uploader"
   #en: new_post: New post
@@ -1161,8 +1147,6 @@ ja:
   uploaded_by: uploaded by
   #en: url: Url
   url: URL
-  #en: user_e_mail: "User e-mail:"
-  user_e_mail: "User e-mail:"
   #en: username: Username
   username: ユーザ名
   #en: user: User

data/config/locales/ru-RU.yml

@@ -52,12 +52,8 @@ ru-RU:
 
   #en: a_few_seconds_ago:  a few seconds ago
   a_few_seconds_ago:  несколько секунд назад
-  #en: about: About
-  about: О
   #en: about_me: About Me
   about_me: Обо мне
-  #en: about_site: About %{site}
-  about_site: "О %{site}"
   #en: about_you: About You
   about_you: О тебе
   #en: admin_pages: Pages
@@ -512,10 +508,6 @@ ru-RU:
   explore_site: Исследование %{site}
   #en: failed: failed
   failed: не удалось
-  #en: faq: FAQ
-  faq: FAQ
-  #en: faq_section: FAQ section
-  faq_section: секция FAQ
   #en: favorited: favorited
   favorited: избранное
   #en: favorites: Favorites
@@ -600,8 +592,6 @@ ru-RU:
   upload_a_profile_photo: "Загрузка фото профиля"
   #en: go: Go
   go: Вперед
-  #en: go2: Go
-  go2: Вперед
   #en: go_check_your_e_mail: Go check your e-mail!
   go_check_your_e_mail: Проверьте ваш e-mail!
   #en: go_to_the_forums: go to the forums
@@ -756,10 +746,8 @@ ru-RU:
   make_this_my_profile_photo: Сделать его моим профильным фото
   #en: male: Male
   male: мужской
-  #en: manage: "Manage:"
-  manage: "Управлять:"
-  #en: manage_my: "Manage my:"
-  manage_my: "Управлять моим:"
+  #en: manage: "Manage"
+  manage: "Управлять"
   #en: manage_pages: Manage Pages
   manage_pages: Управлять страницами
   #en: manage_posts: Manage Posts
@@ -825,8 +813,6 @@ ru-RU:
   month: Месяц
   #en: more: More
   more: Еще
-  #en: more_about_you: More about you
-  more_about_you: Еще о вас
   #en: most_active_1_month: Most active (1 month)
   most_active_1_month: Наиболее активный (1 месяц)
   #en: my_account: My Account
@@ -877,7 +863,7 @@ ru-RU:
   new_metro_area: Новая область
   #en: new_page: New Page
   new_page: Новая страница
-  #en: new_photo: New photo.
+  #en: new_photo: New photo
   new_photo: Новое фото
   #en: new_photos_multiple_uploader: "New Photos » Multiple Uploader"
   new_photos_multiple_uploader: "Новые фотографии » Множественная загрузка"
@@ -1441,8 +1427,6 @@ ru-RU:
   uploaded_by: загружено 
   #en: url: Url
   url: Url
-  #en: user_e_mail: "User e-mail:"
-  user_e_mail: "e-mail пользователя:"
   #en: username: Username
   username: Имя пользователя
   #en: user: User
@@ -1623,8 +1607,6 @@ ru-RU:
   your_about_text_goes_here: Место для вашего текста
   #en: your_account_has_been_activated: Your %{site} account has been activated!
   your_account_has_been_activated: "Ваша %{site} учетная запись была активирована!"
-  #en: your_faq_text_goes_here: Your FAQ text goes here.
-  your_faq_text_goes_here: Текст для вашего FAQ.
   #en: your_changes_were_saved: Your changes were saved.
   your_changes_were_saved: Ваши изменения были сохранены.
   #en:   your_password_reset_instructions_have_been_emailed_to_you: Instructions to reset your password have been emailed to you.

data/config/locales/sr-CP.yml

@@ -15,12 +15,8 @@ sr-CP:
       photo:
         created_at: "created at: "
 
-  #en: about: About
-  about: "\xC3\x9Cber"
   #en: about_me: About Me
   about_me: "\xC3\x9Cber mich"
-  #en: about_site: About %{site}
-  about_site: "\xC3\x9Cber %{site}"
   #en: about_you: About You
   about_you: "\xC3\x9Cber Dich"
   #en: account_activation_error: Account activation failed. Your account may already be active. Try logging in or e-mail %{email} for help.

data/config/locales/sv-SE.yml

@@ -45,12 +45,8 @@ sv:
         created_at: "skapades: "
   #en: a_few_seconds_ago:  a few seconds ago
   a_few_seconds_ago: några sekunder sedan
-  #en: about: About
-  about: Om
   #en: about_me: About Me
   about_me: Om mig
-  #en: about_site: About %{site}
-  about_site: "Om %{site}"
   #en: about_you: About You
   about_you: Om dig
   #en: accept: Accept
@@ -429,10 +425,6 @@ sv:
   explore_site: "Utforska %{site}"
   #en: failed: failed
   failed: misslyckades
-  #en: faq: FAQ
-  faq: FAQ
-  #en: faq_section: FAQ section
-  faq_section: FAQ-avdelning
   #en: favorites: Favorites
   favorites: Favoriter
   #en: favorite_this: Favorite this
@@ -507,8 +499,6 @@ sv:
   get_started_upload_a_profile_photo: "Kom igång: ladda upp en profilbild"
   #en: go: Go
   go: Gå
-  #en: go2: Go
-  go2: Gå
   #en: go_check_your_e_mail: Go check your e-mail!
   go_check_your_e_mail: Kolla dina mejl!
   #en: go_to_the_forums: go to the forums
@@ -637,8 +627,6 @@ sv:
   make_this_my_profile_photo: Gör detta till min profilbild
   #en: male: Male
   male: Man
-  #en: manage_my: "Manage my:"
-  manage_my: "Hantera min:"
   #en: manage_posts: Manage Posts
   manage_posts: Hantera inlägg
   #en: medium: Medium
@@ -679,8 +667,6 @@ sv:
   month: Månad
   #en: more: More
   more: Mer
-  #en: more_about_you: More about you
-  more_about_you: Mer om dig
   #en: most_active_1_month: Most active (1 month)
   most_active_1_month: Mest aktiv (1 månad)
   #en: my_details: My Details
@@ -719,8 +705,8 @@ sv:
   new_invitation_from: Ny inbjudan från
   #en: new_metro_area: New Metro Area
   new_metro_area: Nytt storstadsområde
-  #en: new_photo: New photo.
-  new_photo: Ny bild.
+  #en: new_photo: New photo
+  new_photo: Ny bild
   #en: new_photos_multiple_uploader: "New Photos » Multiple Uploader"
   new_photos_multiple_uploader: "Nya bilder » multiuppladdare"
   #en: new_post: New post
@@ -1189,8 +1175,6 @@ sv:
   uploaded_by: uppladdad av
   #en: url: Url
   url: Webbadress
-  #en: user_e_mail: "User e-mail:"
-  user_e_mail: "Mejladress:"
   #en: username: Username
   username: Användarnamn
   #en: user: User
@@ -1410,7 +1394,7 @@ sv:
   most_recent: "senaste"
   most_popular: "mest populära"
   make_page_public: "Gör den här sidan publik"
-  manage: "Hantera:"
+  manage: "Hantera"
   manage_pages: "Hantera sidor"
   map_it: "Lägg in det på kartan!"
   read: "läst"
@@ -1499,7 +1483,6 @@ sv:
     one: "Du har skrivit 1 inlägg."
     other: "Du har skrivit %{count} inlägg."
   your_account_has_been_activated: "Ditt %{site}-konto har aktiverats!"
-  your_faq_text_goes_here: "Din FAQ text sätter du här."
   your_rsvp_has_been_retracted: "Ditt svar har tagits tillbaka."
   your_rsvp_was_successfully_created: "Ditt svar har lagrats."
   your_rsvp_was_successfully_updated: "Ditt svar har uppdaterats."

data/config/routes.rb

@@ -1,11 +1,15 @@
 Rails.application.routes.draw do
+  concern :paginatable do
+    get '(page/:page)', :action => :index, :on => :collection
+  end
+
   get '/base/:action' => 'base'
 
   get '/forums/recent' => 'sb_posts#index', :as => :recent_forum_posts
   get '/photos/recent' => 'photos#recent', :as => :recent_photos
 
   resources :authorizations
-  match '/auth/:provider/callback' => 'authorizations#create', :as => :callback
+  get '/auth/:provider/callback' => 'authorizations#create', :as => :callback
   get '/auth/failure' => 'authorizations#failure'
 
   resources :sb_posts, :as => 'all_sb_posts' do
@@ -42,10 +46,10 @@ Rails.application.routes.draw do
 
   scope "/admin" do
     get 'dashboard' => 'homepage_features#index', :as => :admin_dashboard
-    get 'users' => 'admin#users', :as => :admin_users
+    match 'users' => 'admin#users', :as => :admin_users, :via => [:post, :get]
     get 'messages' => 'admin#messages', :as => :admin_messages
-    get 'comments' => 'admin#comments', :as => :admin_comments
-    get 'tags' => 'tags#manage', :as => :admin_tags
+    match 'comments' => 'admin#comments', :as => :admin_comments, :via => [:post, :get]
+    match 'tags' => 'tags#manage', :as => :admin_tags, :via => [:post, :get]
     get 'events' => 'admin#events', :as => :admin_events
     get 'clear_cache' => 'admin#clear_cache', :as => :admin_clear_cache
     get 'subscribers(.:format)' => "admin#subscribers", :as => :admin_subscribers
@@ -69,8 +73,9 @@ Rails.application.routes.draw do
   get '/signup/:inviter_id/:inviter_code' => 'users#new', :as => :signup_by_id
   get '/forgot_password' => 'password_resets#new', :as => :forgot_password
   resources :password_resets
-  get '/forgot_username' => 'users#forgot_username', :as => :forgot_username
-  post '/forgot_username' => 'users#forgot_username'
+
+  match '/forgot_username' => 'users#forgot_username', :as => :forgot_username, :via => [:get, :post]
+
   post '/resend_activation' => 'users#resend_activation', :as => :resend_activation
 
   get '/new_clipping' => 'clippings#new_clipping'
@@ -87,9 +92,6 @@ Rails.application.routes.draw do
   get '/rss' => 'base#rss_site_index', :as => :rss_redirect
   get '/site_index.rss' => 'base#site_index', :as => :rss, :format => 'rss'
   get '/advertise' => 'base#advertise', :as => :advertise
-  get '/css_help' => 'base#css_help', :as => :css_help
-  get '/about' => 'base#about', :as => :about
-  get '/faq' => 'base#faq', :as => :faq
   get '/footer_content' => 'base#footer_content', :as => :footer_content
 
   get '/account/edit' => 'users#edit_account', :as => :edit_account_from_email
@@ -117,8 +119,7 @@ Rails.application.routes.draw do
   resources :categories
   post '/categories/show_tips' => 'categories#show_tips', :as => :categories_show_tips
 
-  resources :events do
-    get 'page/:page', :action => :index, :on => :collection
+  resources :events, :concerns => :paginatable do
     collection do
       get :past
       get :ical
@@ -128,10 +129,6 @@ Rails.application.routes.draw do
     end
     resources :rsvps
   end
-
-  scope '/:favoritable_type/:favoritable_id' do
-    resources :favorites
-  end
   scope "/:commentable_type/:commentable_id" do
     resources :comments, :as => :commentable_comments do
       member do
@@ -140,8 +137,12 @@ Rails.application.routes.draw do
       end
     end
   end
+  resources :comments do
+    collection do
+      delete :delete_selected
+    end
+  end
   resources :comments
-  delete '/comments/delete_selected' => 'comments#delete_selected', :as => :delete_selected_comments
 
   resources :homepage_features
   resources :metro_areas
@@ -149,9 +150,7 @@ Rails.application.routes.draw do
 
   resources :activities
 
-  resources :users do
-
-    get 'page/:page', :action => :index, :on => :collection
+  resources :users, :concerns => :paginatable do
 
     collection do
       post 'return_admin'
@@ -164,12 +163,12 @@ Rails.application.routes.draw do
       get 'signup_completed'
       get 'activate'
 
-      put 'toggle_moderator'
-      put 'toggle_featured'
+      patch 'toggle_moderator'
+      patch 'toggle_featured'
 
-      put 'change_profile_photo'
-      put 'update_account'
-      put 'deactivate'
+      patch 'change_profile_photo'
+      patch 'update_account'
+      patch 'deactivate'
 
       get 'welcome_photo'
       get 'welcome_about'
@@ -179,10 +178,8 @@ Rails.application.routes.draw do
       post 'assume'
 
       get 'statistics'
-      get 'crop_profile_photo'
-      put 'crop_profile_photo'
-      get 'upload_profile_photo'
-      put 'upload_profile_photo'
+      match 'crop_profile_photo', :via => [:get, :put, :patch]
+      match 'upload_profile_photo', :via => [:get, :put, :patch]
     end
 
     resources :friendships do
@@ -192,26 +189,22 @@ Rails.application.routes.draw do
         get :denied
       end
       member do
-        put :accept
-        put :deny
+        patch :accept
+        patch :deny
       end
     end
 
-    resources :photos do
-      get 'page/:page', :action => :index, :on => :collection
-    end
-
-    resources :posts do
-      get 'page/:page', :action => :index, :on => :collection
+    resources :photos, :concerns => :paginatable
 
+    resources :posts, :concerns => :paginatable do
       collection do
         # get 'manage(/page/:page)', :action => :manage
-        get :manage
+        match :manage, :via => [:get, :post]
       end
 
       member do
         post :send_to_friend
-        put :update_views
+        patch :update_views
         get :category_tips_update
         get :preview
       end
@@ -219,8 +212,7 @@ Rails.application.routes.draw do
 
     resources :clippings
 
-    resources :activities do
-      get 'page/:page', :action => :index, :on => :collection
+    resources :activities, :concerns => :paginatable do
       collection do
         get :network
       end
@@ -230,11 +222,10 @@ Rails.application.routes.draw do
 
     resources :favorites
     resources :messages do
-      post :auto_complete_for_username, :on => :collection
+      get :auto_complete_for_username, :on => :collection
       collection do
         post :delete_message_threads
         post :delete_selected
-
       end
     end
 
@@ -252,6 +243,10 @@ Rails.application.routes.draw do
 
   end
 
+  scope '/:favoritable_type/:favoritable_id' do
+    resources :favorites
+  end
+
   resources :votes
   resources :invitations
   get '/users/:user_id/posts/category/:category_name' => 'posts#index', :as => :users_posts_in_category

data/db/migrate/016_add_metro_areas.rb

@@ -276,11 +276,11 @@ class AddMetroAreas < ActiveRecord::Migration
       a = ma.split(', ')
       city_name = a[0]
       state_name = a[1]
-      state = State.find(:first, :conditions => "name = '#{state_name}'")
+      state = State.where("name = '#{state_name}'").first
 
       next if state.nil?
       
-      ma = MetroArea.new(:name => a[0], :state => state, :country_id => 0)
+      ma = MetroArea.new(:name => a[0], :state_id => state.id, :country_id => 0)
       ma.save
     end
     if failed.size > 0