assets/stylesheets/reset-fonts-grids.css engine_config/initializers/globalite.rb engine_plugins/globalite/CHANGELOG engine_plugins/globalite/README engine_plugins/globalite/README.rdoc engine_plugins/globalite/Rakefile engine_plugins/globalite/globalite.gemspec engine_plugins/globalite/init.rb engine_plugins/globalite/install.rb engine_plugins/globalite/lang/rails/de-DE.yml engine_plugins/globalite/lang/rails/en-UK.yml engine_plugins/globalite/lang/rails/en-US.yml engine_plugins/globalite/lang/rails/es-AR.yml engine_plugins/globalite/lang/rails/es-ES.yml engine_plugins/globalite/lang/rails/fi-FI.yml engine_plugins/globalite/lang/rails/fr-FR.yml engine_plugins/globalite/lang/rails/hu-HU.yml engine_plugins/globalite/lang/rails/it.yml engine_plugins/globalite/lang/rails/mg.yml engine_plugins/globalite/lang/rails/nl-NL.yml engine_plugins/globalite/lang/rails/pl-PL.yml engine_plugins/globalite/lang/rails/pt-BR.yml engine_plugins/globalite/lang/rails/pt-PT.yml engine_plugins/globalite/lang/rails/ru-RU.yml engine_plugins/globalite/lang/rails/sr-CP.yml engine_plugins/globalite/lang/rails/sr-SR.yml engine_plugins/globalite/lang/rails/tr.yml engine_plugins/globalite/lang/rails/zh-CN.yml engine_plugins/globalite/lang/rails/zh-HK.yml engine_plugins/globalite/lang/rails/zh-TW.yml engine_plugins/globalite/lib/globalite.rb engine_plugins/globalite/lib/globalite/l10n.rb engine_plugins/globalite/lib/globalite/locale.rb engine_plugins/globalite/lib/rails/core_ext.rb engine_plugins/globalite/lib/rails/localization.rb engine_plugins/globalite/lib/rails/localized_action_view.rb engine_plugins/globalite/lib/rails/localized_active_record.rb engine_plugins/globalite/rdoc/classes/ActionView.html engine_plugins/globalite/rdoc/classes/ActionView/Helpers.html engine_plugins/globalite/rdoc/classes/ActionView/Helpers/DateHelper.html engine_plugins/globalite/rdoc/classes/ActionView/Helpers/FormOptionsHelper.html engine_plugins/globalite/rdoc/classes/ActionView/Helpers/NumberHelper.html engine_plugins/globalite/rdoc/classes/ActiveRecord.html engine_plugins/globalite/rdoc/classes/ActiveRecord/Errors.html engine_plugins/globalite/rdoc/classes/Array.html engine_plugins/globalite/rdoc/classes/Date.html engine_plugins/globalite/rdoc/classes/Globalite.html engine_plugins/globalite/rdoc/classes/Globalite/L10n.html engine_plugins/globalite/rdoc/classes/Kernel.html engine_plugins/globalite/rdoc/classes/Locale.html engine_plugins/globalite/rdoc/classes/Time.html engine_plugins/globalite/rdoc/created.rid engine_plugins/globalite/rdoc/files/README.html engine_plugins/globalite/rdoc/files/lib/globalite/l10n_rb.html engine_plugins/globalite/rdoc/files/lib/globalite/locale_rb.html engine_plugins/globalite/rdoc/files/lib/globalite_rb.html engine_plugins/globalite/rdoc/files/lib/rails/core_ext_rb.html engine_plugins/globalite/rdoc/files/lib/rails/localization_rb.html engine_plugins/globalite/rdoc/files/lib/rails/localized_action_view_rb.html engine_plugins/globalite/rdoc/files/lib/rails/localized_active_record_rb.html engine_plugins/globalite/rdoc/fr_class_index.html engine_plugins/globalite/rdoc/fr_file_index.html engine_plugins/globalite/rdoc/fr_method_index.html engine_plugins/globalite/rdoc/index.html engine_plugins/globalite/rdoc/rdoc-style.css engine_plugins/globalite/spec/core_localization_spec.rb engine_plugins/globalite/spec/helpers/spec_helper.rb engine_plugins/globalite/spec/l10n_spec.rb engine_plugins/globalite/spec/lang/rails/zz.yml engine_plugins/globalite/spec/lang/ui/en-UK.yml engine_plugins/globalite/spec/lang/ui/en-US.yml engine_plugins/globalite/spec/lang/ui/es.yml engine_plugins/globalite/spec/lang/ui/fr-FR.yml engine_plugins/globalite/tasks/cruise.rake engine_plugins/globalite/tasks/globalite_tasks.rake engine_plugins/globalite/uninstall.rb lang/ui/en-US.yml lang/ui/es-AR.yml lib/globalite_extensions.rb lib/localized_application.rb @@ -16,7 +16,7 @@ class AdminController < BaseController def activate_user user = User.find(params[:id]) user.activate - flash[:notice] = "The user was activated" + flash[:notice] = "The user was activated".l redirect_to :action => :users end app/controllers/admin_controller.rb @@ -41,7 +41,7 @@ class AdsController < BaseController respond_to do |format| if @ad.save - flash[:notice] = 'Ad was successfully created.' + flash[:notice] = 'Ad was successfully created.'.l format.html { redirect_to ad_url(@ad) } format.xml { head :created, :location => ad_url(@ad) } else @@ -58,7 +58,7 @@ class AdsController < BaseController respond_to do |format| if @ad.update_attributes(params[:ad]) - flash[:notice] = 'Ad was successfully updated.' + flash[:notice] = 'Ad was successfully updated.'.l format.html { redirect_to ad_url(@ad) } format.xml { head :ok } else app/controllers/ads_controller.rb @@ -4,6 +4,8 @@ require 'pp' class BaseController < ApplicationController include AuthenticatedSystem + include LocalizedApplication + around_filter :set_locale before_filter :login_from_cookie skip_before_filter :verify_authenticity_token, :only => :footer_content @@ -75,12 +77,12 @@ class BaseController < ApplicationController if @user = User.find(params[:user_id] || params[:id]) @is_current_user = (@user && @user.eql?(current_user)) unless logged_in? || @user.profile_public? - flash.now[:error] = "This user's profile is not public. You'll need to create an account and log in to access it." + flash.now[:error] = "This user's profile is not public. You'll need to create an account and log in to access it.".l redirect_to :controller => 'sessions', :action => 'new' end return @user else - flash.now[:error] = "Please log in." + flash.now[:error] = "Please log in.".l redirect_to :controller => 'sessions', :action => 'new' return false end app/controllers/base_controller.rb @@ -63,7 +63,7 @@ class CategoriesController < BaseController respond_to do |format| if @category.save - flash[:notice] = 'Category was successfully created.' + flash[:notice] = 'Category was successfully created.'.l format.html { redirect_to category_url(@category) } format.xml do app/controllers/categories_controller.rb @@ -145,7 +145,7 @@ class ClippingsController < BaseController respond_to do |format| if @clipping.save! @clipping.tag_with(params[:tag_list] || '') - flash[:notice] = 'Clipping was successfully created.' + flash[:notice] = 'Clipping was successfully created.'.l format.html { unless params[:user_id] redirect_to_url(@clipping.url) rescue redirect_to user_clipping_url(@user, @clipping) app/controllers/clippings_controller.rb @@ -13,7 +13,7 @@ class CommentsController < BaseController @commentable = Inflector.constantize(Inflector.camelize(params[:commentable_type])).find(params[:commentable_id]) unless logged_in? || @commentable && @commentable.owner.profile_public? - flash.now[:error] = "This user's profile is not public. You'll need to create an account and log in to access it." + flash.now[:error] = "This user's profile is not public. You'll need to create an account and log in to access it.".l redirect_to :controller => 'sessions', :action => 'new' and return end @@ -54,7 +54,7 @@ class CommentsController < BaseController respond_to do |format| format.html { - flash[:notice] = "Sorry, we couldn't find any comments for that #{Inflector.constantize(Inflector.camelize(params[:commentable_type]))}" + flash[:notice] = :no_comments_found.l_with_args(type => Inflector.constantize(Inflector.camelize(params[:commentable_type]))) redirect_to :controller => 'base', :action => 'site_index' and return } format.rss { @@ -89,13 +89,13 @@ class CommentsController < BaseController UserNotifier.deliver_comment_notice(@comment) if should_receive_notification(@comment) deliver_comment_notice_to_previous_commenters(@comment) - flash.now[:notice] = 'Comment was successfully created.' + flash.now[:notice] = 'Comment was successfully created.'.l format.html { redirect_to :controller => Inflector.underscore(params[:commentable_type]).pluralize, :action => 'show', :id => params[:commentable_id], :user_id => @comment.recipient.id } format.js { render :partial => 'comments/comment.html.haml', :locals => {:comment => @comment, :highlighted => true} } else - flash.now[:error] = "Your comment couldn't be saved. #{@comment.errors.full_messages.join(", ")}" + flash.now[:error] = :comment_save_error.l_with_args(:error => @comment.errors.full_messages.join(", ")) format.html { redirect_to :controller => Inflector.underscore(params[:commentable_type]).pluralize, :action => 'show', :id => params[:commentable_id] } format.js{ render :inline => flash[:error], :status => 500 @@ -108,9 +108,9 @@ class CommentsController < BaseController @comment = Comment.find(params[:id]) if @comment.can_be_deleted_by(current_user) @comment.destroy - flash.now[:notice] = "The comment was deleted." + flash.now[:notice] = "The comment was deleted.".l else - flash.now[:error] = "Comment could not be deleted." + flash.now[:error] = "Comment could not be deleted.".l end respond_to do |format| format.html { redirect_to users_url } app/controllers/comments_controller.rb @@ -42,7 +42,7 @@ class ContestsController < BaseController respond_to do |format| if @contest.save - flash[:notice] = 'Contest was successfully created.' + flash[:notice] = 'Contest was successfully created.'.l format.html { redirect_to contest_url(@contest) } format.xml do app/controllers/contests_controller.rb @@ -26,7 +26,7 @@ class EventsController < BaseController respond_to do |format| if @event.save - flash[:notice] = 'Event was successfully created.' + flash[:notice] = 'Event was successfully created.'.l format.html { redirect_to events_path } else app/controllers/events_controller.rb @@ -22,7 +22,7 @@ class FriendshipsController < BaseController respond_to do |format| if @friendship.update_attributes(:friendship_status => FriendshipStatus[:denied]) && @friendship.reverse.update_attributes(:friendship_status => FriendshipStatus[:denied]) - flash[:notice] = "The friendship was denied." + flash[:notice] = "The friendship was denied.".l format.html { redirect_to denied_user_friendships_path(@user) } else format.html { render :action => "edit" } @@ -36,7 +36,7 @@ class FriendshipsController < BaseController respond_to do |format| if @friendship.update_attributes(:friendship_status => FriendshipStatus[:accepted]) && @friendship.reverse.update_attributes(:friendship_status => FriendshipStatus[:accepted]) - flash[:notice] = "The friendship was accepted." + flash[:notice] = "The friendship was accepted.".l format.html { redirect_to accepted_user_friendships_path(@user) } @@ -108,12 +108,12 @@ class FriendshipsController < BaseController if @friendship.save && reverse_friendship.save UserNotifier.deliver_friendship_request(@friendship) if @friendship.friend.notify_friend_requests? format.html { - flash[:notice] = "Requested friendship with #{@friendship.friend.login}." + flash[:notice] = :friendship_requested.l_with_args(:friend => @friendship.friend.login) redirect_to accepted_user_friendships_path(@user) } format.js { render( :inline => "Requested friendship with #{@friendship.friend.login}." ) } else - flash.now[:error] = 'Friendship could not be created' + flash.now[:error] = 'Friendship could not be created'.l @users = User.find(:all) format.html { redirect_to user_friendships_path(@user) } format.js { render( :inline => "Friendship request failed." ) } app/controllers/friendships_controller.rb @@ -40,7 +40,7 @@ class HomepageFeaturesController < BaseController respond_to do |format| if @homepage_feature.save - flash[:notice] = 'Homepage Feature was successfully created.' + flash[:notice] = 'Homepage Feature was successfully created.'.l format.html { redirect_to homepage_feature_url(@homepage_feature) } else app/controllers/homepage_features_controller.rb @@ -44,7 +44,7 @@ class InvitationsController < BaseController respond_to do |format| if @invitation.save - flash[:notice] = 'Invitation was successfully created.' + flash[:notice] = 'Invitation was successfully created.'.l format.html { unless params[:welcome] redirect_to user_path(@invitation.user) app/controllers/invitations_controller.rb @@ -28,7 +28,7 @@ class MetroAreasController < BaseController respond_to do |format| if @metro_area.save - flash[:notice] = 'MetroArea was successfully created.' + flash[:notice] = 'MetroArea was successfully created.'.l format.html { redirect_to metro_area_url(@metro_area) } format.xml do app/controllers/metro_areas_controller.rb @@ -42,7 +42,7 @@ class OfferingsController < BaseController respond_to do |format| if @offering.save - flash[:notice] = 'Offering was successfully created.' + flash[:notice] = 'Offering was successfully created.'.l format.html { redirect_to user_offering_url(@offering) } format.xml do @@ -91,9 +91,9 @@ class OfferingsController < BaseController @user = User.find(params[:user_id]) @offering = Offering.find(params[:id]) if @offering.destroy - flash.now[:notice] = "The service was deleted." + flash.now[:notice] = "The service was deleted.".l else - flash.now[:error] = "Service could not be deleted." + flash.now[:error] = "Service could not be deleted.".l end respond_to do |format| app/controllers/offerings_controller.rb @@ -109,7 +109,7 @@ class PhotosController < BaseController @photo.tag_with(params[:tag_list] || '') #start the garbage collector GC.start - flash[:notice] = 'Photo was successfully created.' + flash[:notice] = 'Photo was successfully created.'.l format.html { render :action => 'inline_new', :layout => false and return if params[:inline] app/controllers/photos_controller.rb @@ -107,7 +107,7 @@ class PostsController < BaseController @post.create_poll(params[:poll], params[:choices]) if params[:poll] @post.tag_with(params[:tag_list] || '') - flash[:notice] = @post.category ? "Your '#{Inflector.singularize(@post.category.name)}' post was successfully created." : "Your post was successfully created." + flash[:notice] = @post.category ? :post_created_for_category.l_with_args(:category => Inflector.singularize(@post.category.name)) : "Your post was successfully created.".l format.html { if @post.is_live? redirect_to @post.category ? category_path(@post.category) : user_post_path(@user, @post) @@ -148,7 +148,7 @@ class PostsController < BaseController respond_to do |format| format.html { - flash[:notice] = "Your post was deleted." + flash[:notice] = "Your post was deleted.".l redirect_to manage_user_posts_url(@user) } end app/controllers/posts_controller.rb @@ -47,7 +47,7 @@ class SbPostsController < BaseController if @topic.locked? respond_to do |format| format.html do - flash[:notice] = 'This topic is locked.' + flash[:notice] = 'This topic is locked.'.l redirect_to(forum_topic_path(:forum_id => params[:forum_id], :id => params[:topic_id])) end format.xml do @@ -67,7 +67,7 @@ class SbPostsController < BaseController format.xml { head :created, :location => formatted_sb_user_post_url(:forum_id => params[:forum_id], :topic_id => params[:topic_id], :id => @post, :format => :xml) } end rescue ActiveRecord::RecordInvalid - flash[:bad_reply] = 'Please post something at least...' + flash[:bad_reply] = 'Please post something at least...'.l respond_to do |format| format.html do redirect_to forum_topic_path(:forum_id => params[:forum_id], :id => params[:topic_id], :anchor => 'reply-form', :page => params[:page] || '1') @@ -87,7 +87,7 @@ class SbPostsController < BaseController @post.attributes = params[:post] @post.save! rescue ActiveRecord::RecordInvalid - flash[:bad_reply] = 'An error occurred' + flash[:bad_reply] = 'An error occurred'.l ensure respond_to do |format| format.html do @@ -100,7 +100,7 @@ class SbPostsController < BaseController def destroy @post.destroy - flash[:notice] = "Post: '#{CGI::escapeHTML @post.topic.title}' was deleted." + flash[:notice] = :sb_post_was_deleted.l_with_args(:title => CGI::escapeHTML(@post.topic.title)) # check for posts_count == 1 because its cached and counting the currently deleted post @post.topic.destroy and redirect_to forum_path(params[:forum_id]) if @post.topic.sb_posts_count == 1 respond_to do |format| app/controllers/sb_posts_controller.rb @@ -23,10 +23,10 @@ class SessionsController < BaseController end redirect_back_or_default(dashboard_user_path(current_user)) - flash[:notice] = "Thanks! You're now logged in." + flash[:notice] = "Thanks! You're now logged in.".l current_user.track_activity(:logged_in) else - flash[:notice] = "Uh oh. We couldn't log you in with the username and password you entered. Try again?" + flash[:notice] = "Uh oh. We couldn't log you in with the username and password you entered. Try again?".l redirect_to teaser_path and return if AppConfig.closed_beta_mode render :action => 'new' end @@ -36,7 +36,7 @@ class SessionsController < BaseController self.current_user.forget_me if logged_in? cookies.delete :auth_token reset_session - flash[:notice] = "You've been logged out. Hope you come back soon!" + flash[:notice] = "You've been logged out. Hope you come back soon!".l redirect_to new_session_path end app/controllers/sessions_controller.rb @@ -61,7 +61,7 @@ class SkillsController < BaseController respond_to do |format| if @skill.save - flash[:notice] = 'Skill was successfully created.' + flash[:notice] = 'Skill was successfully created.'.l format.html { redirect_to skill_url(@skill) } format.xml do app/controllers/skills_controller.rb @@ -21,7 +21,7 @@ class TagsController < BaseController def show @tag = Tag.find_by_name(params[:id]) if @tag.nil? - flash[:notice] = "The tag #{params[:id]} does not exist." + flash[:notice] = :tag_does_not_exists.l_with_args(:tag => params[:id]) redirect_to :action => :index and return end @related_tags = @tag.related_tags app/controllers/tags_controller.rb @@ -89,7 +89,7 @@ class TopicsController < BaseController def destroy @topic.destroy - flash[:notice] = "Topic '#{CGI::escapeHTML @topic.title}' was deleted." + flash[:notice] = :topic_deleted.l_with_args(:topic => CGI::escapeHTML(@topic.title)) respond_to do |format| format.html { redirect_to forum_path(@forum) } format.xml { head 200 } app/controllers/topics_controller.rb @@ -30,10 +30,10 @@ class UsersController < BaseController if @user and @user.activate self.current_user = @user redirect_to welcome_photo_user_path(@user) - flash[:notice] = "Thanks for activating your account!" + flash[:notice] = "Thanks for activating your account!".l return end - flash[:error] = "Account activation failed. Your account may already be active. Try logging in or e-mail #{AppConfig.support_email} for help." + flash[:error] = :account_activation_error.l_with_args(:email => AppConfig.support_email) redirect_to signup_path end @@ -81,7 +81,7 @@ class UsersController < BaseController @user.role = Role[:member] @user.save! create_friendship_with_inviter(@user, params) - flash[:notice] = "Thanks for signing up! You should receive an e-mail confirmation shortly at #{@user.email}" + flash[:notice] = :email_signup_thanks.l_with_args(:email => @user.email) redirect_to signup_completed_user_path(@user) rescue ActiveRecord::RecordInvalid render :action => 'new' @@ -119,7 +119,7 @@ class UsersController < BaseController @user.track_activity(:updated_profile) @user.tag_with(params[:tag_list] || '') - flash[:notice] = "Your changes were saved." + flash[:notice] = "Your changes were saved.".l unless params[:welcome] redirect_to user_path(@user) else @@ -133,9 +133,9 @@ class UsersController < BaseController def destroy unless @user.admin? @user.destroy - flash[:notice] = "The user was deleted." + flash[:notice] = "The user was deleted.".l else - flash[:error] = "You can't delete that user." + flash[:error] = "You can't delete that user.".l end respond_to do |format| format.html { redirect_to users_url } @@ -147,7 +147,7 @@ class UsersController < BaseController @photo = Photo.find(params[:photo_id]) @user.avatar = @photo if @user.save! - flash[:notice] = "Your changes were saved." + flash[:notice] = "Your changes were saved.".l redirect_to user_photo_path(@user, @photo) end rescue ActiveRecord::RecordInvalid @@ -166,7 +166,7 @@ class UsersController < BaseController @user.attributes = params[:user] if @user.save! - flash[:notice] = "Your changes were saved." + flash[:notice] = "Your changes were saved.".l redirect_to user_path(@user) end rescue ActiveRecord::RecordInvalid @@ -186,7 +186,7 @@ class UsersController < BaseController if @user.save! respond_to do |format| format.html { - flash[:notice] = "Your changes were saved." + flash[:notice] = "Your changes were saved.".l redirect_to edit_pro_details_user_path(@user) } format.js { @@ -235,7 +235,7 @@ class UsersController < BaseController end def welcome_complete - flash[:notice] = "You've completed the #{AppConfig.community_name} walk-through. Now you can continue exploring!" + flash[:notice] = :walkthrough_complete.l_with_args(:site => AppConfig.community_name) redirect_to user_path end @@ -247,10 +247,10 @@ class UsersController < BaseController UserNotifier.deliver_reset_password(@user) @user.save redirect_to login_url - flash[:info] = "Your password has been reset and emailed to you." + flash[:info] = "Your password has been reset and emailed to you.".l end else - flash[:error] = "Sorry. We don't recognize that email address." + flash[:error] = "Sorry. We don't recognize that email address.".l end end @@ -262,10 +262,10 @@ class UsersController < BaseController UserNotifier.deliver_forgot_username(@user) @user.save redirect_to login_url - flash[:info] = "Your username was emailed to you." + flash[:info] = "Your username was emailed to you.".l end else - flash[:error] = "Sorry. We don't recognize that email address." + flash[:error] = "Sorry. We don't recognize that email address.".l end end app/controllers/users_controller.rb @@ -4,9 +4,17 @@ module UsersHelper end def random_greeting(user) - greetings = ['Hello', 'Hola', 'Hi ', 'Yo', 'Welcome back,', 'Greetings', - 'Wassup', 'Aloha', 'Halloo'] - "#{greetings.sort_by {rand}.first} #{user.login}!" + greetings = [:greeting_1, + :greeting_2, + :greeting_3, + :greeting_4, + :greeting_5, + :greeting_6, + :greeting_7, + :greeting_8, + :greeting_9, + :greeting_10] + return greetings.sort_by {rand}.first().l(:user => user.login) end end \ No newline at end of file app/helpers/users_helper.rb @@ -34,7 +34,7 @@ class Category < ActiveRecord::Base end def display_new_post_text - new_post_text || "Write a '#{self.name}' post" + new_post_text end end app/models/category.rb @@ -6,33 +6,33 @@ - if activity.item - case activity.item_type - when 'Post' - =" wrote a post: " + ="wrote a post:".l = link_to activity.item.title, user_post_path(activity.item.user, activity.item) - when 'Photo' - =" uploaded a photo: " + ="uploaded a photo:".l = link_to image_tag(activity.item.public_filename(:thumb), :width => '50px'), user_photo_path(activity.item.user, activity.item) - when 'Topic' - =" started a topic: " + ="started a topic:".l -topic = activity.item = link_to truncate_words(topic.title), forum_topic_path(topic.forum, topic) - when 'SbPost' - =" added to a forum topic: " + ="added to a forum topic:".l - topic = activity.item.topic = link_to truncate_words(activity.item.body), forum_topic_path(topic.forum, topic) - when 'Comment' - =" left a comment: " + ="left a comment:".l = link_to truncate_words(activity.item.comment), activity.item.generate_commentable_url - when 'Favorite' - =" favorited" + =" favorited".l = link_to " a #{activity.item.favoritable.class.to_s.humanize.downcase}", user_favorite_path(activity.item.user, activity.item) - when 'Clipping' - =" added a clipping: " + ="added a clipping:".l = link_to image_tag( activity.item.image_uri(:thumb), :width => '50px'), user_clipping_path(activity.item.user, activity.item) - else - case activity.action - when 'updated_profile' - updated their profile + ="updated their profile".l - when 'logged_in' - logged into the site + ="logged into the site".l - else = " #{activity.action.sub("_", " ") }" \ No newline at end of file app/views/activities/_activity.html.haml @@ -4,11 +4,11 @@ #yui-main .yui-b.box -unless @activities.empty? - %h3 Activity from your network + %h3="Activity from your network".l %table{:width => "100%"} =render :partial => "activities/activity", :collection => @activities -if @activities.page_count > 1 .pagination= paginating_links @activities, :link_to_current_page => true -else - You have no network activity yet. - = link_to "Add some friends to get started!", users_path \ No newline at end of file + ="You have no network activity yet.".l + = link_to "Add some friends to get started!".l, users_path \ No newline at end of file app/views/activities/network.html.haml @@ -5,23 +5,24 @@ .yui-b.box %h3 = AppConfig.community_name - Members + = "Members".l - form_tag '/admin/users', :class => 'MainForm' do - %label User login: + %label= "User login:".l = text_field_tag 'login', params['login'] - %label User e-mail: + %label= "User e-mail:".l = text_field_tag 'email', params['email'] %p - %input{"type"=>"submit", "value"=>"Search Users"} + %input{:type=>"submit", :value=> :search_users.l } .pagination= pagination_links_for @pages, {:link_to_current_page => true} if @pages.length > 1 %table{"cellspacing"=>"0", "border"=>"0", "cellpadding"=>"0", "width"=>"100%"} %tr - %th Login - %th E-mail - %th Status - %th Actions + %th="Login".l + %th="E-mail".l + %th="Status".l + %th="Actions".l + - @users.each do |user| %tr %td @@ -29,9 +30,9 @@ %td = h user.email %td - = user.active? ? 'active' : 'inactive' + = user.active? ? 'active'.l : 'inactive'.l %td - = link_to( "Assume ID", assume_user_path(user) ) - = (" | " + link_to("Activate", :controller => "/admin", :action => "activate_user", :id => user.id)) unless user.active? + = link_to( "Assume ID".l , assume_user_path(user) ) + = (" | " + link_to("Activate".l, :controller => "/admin", :action => "activate_user", :id => user.id)) unless user.active? .pagination= pagination_links_for @pages, {:link_to_current_page => true} if @pages.length > 1 app/views/admin/users.html.haml @@ -1,31 +1,31 @@ .box - %h3 Editing ad + %h3="Editing ad".l = error_messages_for :ad - form_for(:ad, :url => ad_path(@ad), :html => { :method => :put, :class => "MainForm" }) do |f| - %label Name + %label="Name".l = f.text_field :name - %label Html + %label="Html".l = f.text_area :html, :size => '80x10' - %label Frequency + %label="Frequency".l = f.select :frequency, Ad.frequencies_for_select - %label Audience + %label= "Audience".l = f.select :audience, Ad.audiences_for_select %fieldset{"for"=>"ad_published"} = f.check_box :published - %label Published? + %label="Published?".l %fieldset{"for"=>"ad_time_constrained"} = f.check_box :time_constrained - %label Time constrained? + %label="Time constrained?".l #time_constraints{"style"=>"display:#{ @ad.time_constrained? ? 'block' : 'none'}"} - %label Start date + %label="Start date".l = f.datetime_select :start_date - %label End date + %label="End date".l = f.datetime_select :end_date %script{"type"=>"text/javascript", "charset"=>"utf-8"} @@ -35,8 +35,8 @@ = f.text_field :location %p - = submit_tag "Update" + = submit_tag :update.l - = link_to 'Show', ad_path(@ad) + = link_to 'Show'.l, ad_path(@ad) | - = link_to 'Back', ads_path + = link_to 'Back'.l, ads_path app/views/ads/edit.html.haml @@ -3,14 +3,15 @@ #yui-main .yui-b.box - %h3 Ads + %h3= "Ads".l %table{"width"=>"100%"} %tr - %th Name - %th Frequency - %th Published? - %th Run - %th Location + %th="Name".l + %th="Frequency".l + %th="Published?".l + %th="Run".l + %th="Location".l + - for ad in @ads %tr %td= link_to h(ad.name), ad_path(ad) @@ -18,9 +19,9 @@ %td= h ad.published? %td= h ad.time_constrained? ? "#{ad.start_date.to_formatted_s(:short)}-#{ad.end_date.to_formatted_s(:short)}" : "n/a" %td= h ad.location - %td= link_to 'Show', ad_path(ad) - %td= link_to 'Edit', edit_ad_path(ad) - %td= link_to 'Destroy', ad_path(ad), :confirm => 'Are you sure?', :method => :delete + %td= link_to 'Show'.l, ad_path(ad) + %td= link_to 'Edit'.l, edit_ad_path(ad) + %td= link_to 'Destroy'.l, ad_path(ad), :confirm => 'Are you sure?', :method => :delete %br - = link_to 'New ad', new_ad_path + = link_to 'New Ad'.l, new_ad_path app/views/ads/index.html.haml @@ -1,40 +1,40 @@ .box - %h3 New ad + %h3="New Ad".l = error_messages_for :ad - form_for(:ad, :url => ads_path, :html => {:class => "MainForm" }) do |f| - %label Name + %label="Name".l = f.text_field :name - %label Html + %label="Html".l = f.text_area :html, :size => '80x10' - %label Frequency + %label="Frequency".l = f.select :frequency, Ad.frequencies_for_select - %label Audience + %label="Audience".l = f.select :audience, Ad.audiences_for_select %fieldset{"for"=>"ad_published"} = f.check_box :published - %label Published? + %label="Published?".l %fieldset{"for"=>"ad_time_constrained"} = f.check_box :time_constrained - %label Time constrained? + %label="Time constrained?".l #time_constraints{"style"=>"display:#{ @ad.time_constrained? ? 'block' : 'none'}"} - %label Start date + %label="Start date".l = f.datetime_select :start_date - %label End date + %label="End date".l = f.datetime_select :end_date %script{"type"=>"text/javascript", "charset"=>"utf-8"} Event.observe("ad_time_constrained", "click", function(){$('time_constraints').toggle()}) - %label Location + %label="Location".l = f.text_field :location %p - = submit_tag "Create" + = submit_tag :create.l - = link_to 'Back', ads_path \ No newline at end of file + = link_to 'Back'.l, ads_path \ No newline at end of file app/views/ads/new.html.haml @@ -1,23 +1,34 @@ .box - %h3 Showing Ad + %h3="Showing Ad".l %p - %b Name: + %b + ="Name".l + \: = h @ad.name %p - %b Html: + %b + ="Html".l + \: = @ad.html %p - %b Frequency: + %b + ="Frequency".l + \: = h @ad.frequency %p - %strong Published? + %strong="Published?".l = @ad.published? %p - %b Run: + %b + ="Run".l + \: = h @ad.time_constrained? ? "#{@ad.start_date.to_formatted_s(:long)} - #{@ad.end_date.to_formatted_s(:long)}" : 'n/a' %p - %b Location: + %b + ="Location".l + \: = h @ad.location - = link_to 'Edit', edit_ad_path(@ad) + + = link_to 'Edit'.l, edit_ad_path(@ad) | - = link_to 'Back', ads_path + = link_to 'Back'.l, ads_path app/views/ads/show.html.haml @@ -1,20 +1,16 @@ .yui-b .box - %h3="About #{AppConfig.community_name}" - + %h3=:about_site.l(:site => AppConfig.community_name) %ul.list.checks %li - %a{:href=>"/faq"} Frequently Asked Questions + %a{:href=>"/faq"}= "Frequently Asked Questions".l %li - %a{:href=>"/about"} - About - = AppConfig.community_name + %a{:href=>"/about"}=:about_site.l(:site => AppConfig.community_name) %li %a{:href=>"/advertise"} - Advertise - + ="Advertise".l .box.alt - %h3 Need to contact us? + %h3="Need to contact us?".l %p - Don't wait! It's + ="Don't wait! It's".l %a{:href=>"mailto:#{AppConfig.support_email}"}= AppConfig.support_email app/views/base/_about_nav.html.haml @@ -2,18 +2,18 @@ .yui-gc .yui-u.first .box - %h2 - Get started with - %a{:href=>"/"}= AppConfig.community_name - today! + %h2 + =:get_started_banner.l :site=>AppConfig.community_name %p - CommunityEngine is the best way to go from zero to hero in no time. + ="CommunityEngine is the best way to go from zero to hero in no time".l :homepage_banner_msg %h4 - %a{:href=>"http://www.missingmethod.com/projects/community_engine"} Download it now and get started + %a{:href=>"http://www.missingmethod.com/projects/community_engine"} + ="Download it now and get started".l :homepage_banner_download_msg .yui-u .box - %h2 - See how it works - %p Create your account. + %h2 + ="See how it works".l :homepage_banner_signup_prompt + %p + ="Create Your Account".l %h4 - =link_to "Sign up", signup_path \ No newline at end of file + =link_to "Sign Up!".l, signup_path \ No newline at end of file app/views/base/_homepage_banner_message.html.haml @@ -3,4 +3,4 @@ #yui-main .yui-b .box - %h3 Your About Text Goes Here \ No newline at end of file + %h3="Your About Text Goes Here".l \ No newline at end of file app/views/base/about.html.haml @@ -3,4 +3,6 @@ #yui-main .yui-b .box - %h3="Advertise on #{AppConfig.community_name}" \ No newline at end of file + %h3 + ="Advertise on".l + =" #{AppConfig.community_name}" \ No newline at end of file app/views/base/advertise.html.haml @@ -3,13 +3,13 @@ #yui-main .yui-b .box - %h3 Frequently Asked Questions: + %h3="Frequently Asked Questions:".l %h4#what_is_it What Is = AppConfig.community_name %p - Explain what it is + Explain what it is" %h4#tags What Are "Tags"? %p Tags are one-word descriptors that you can assign to your blogs, pictures, and clippings. app/views/base/faq.html.haml @@ -4,33 +4,35 @@ #yui-main .yui-b .box.hfeed - %h3 Recent Posts + %h3 + ="Recent Posts".l = render :partial => 'posts/post', :collection => @posts .yui-b .box - %h3= "Explore #{AppConfig.community_name}" + %h3= :explore_site.l :site => AppConfig.community_name %ul.list.checks - Category.find(:all).each do |c| %li= link_to c.name, category_path(c) - %li= link_to "What's Popular", popular_url, {:class => 'popular'} - %li= link_to "Find an Expert", skills_path, {:class => 'users'} + %li= link_to "What's Popular".l, popular_url, {:class => 'popular'} + %li= link_to "Find an Expert".l, skills_path, {:class => 'users'} .box.alt %h3 - What's Hot? + = "What's Hot".l + %ul.list.page -@popular_posts.each do |post| =render :partial => 'posts/sidebar_post', :locals => {:post => post} %h6.all - %a{:href=>"/popular"} SEE ALL + %a{:href=>"/popular"}= "SEE ALL".l .box.alt - %h3= AppConfig.featured_writer_label.pluralize + %h3= "Featured Writers".l :staff_writers -@featured_writers.each do |user| =render :partial => "users/sidebar_user", :locals => {:user => user} .box.alt - %h3 Active Users + %h3= "Active Users".l -@active_users.each do |user| =render :partial => "users/sidebar_user", :locals => {:user => user} \ No newline at end of file app/views/base/site_index.html.haml @@ -2,15 +2,20 @@ #login - form_tag sessions_path, :class => "MainForm" do - %label{"for"=>"username"} Username: + %label{"for"=>"username"} + ="Username".l + \: = text_field_tag 'login', nil, :size => 35 - %label{"for"=>"password"} Password: + %label{"for"=>"password"} + ="Password".l + \: = password_field_tag 'password', nil, :size => 35 %fieldset %label{"for"=>"remember_me"} - Remember me: + ="Remember me".l + \: = check_box_tag 'remember_me' - %p= submit_tag 'Log in' + %p= submit_tag :log_in app/views/base/teaser.html.haml @@ -2,7 +2,7 @@ %h3= category.name %p= category.tips - else - %h3 We need you + %h3="We need you".l %p %em Every single person has something to say, something to give, something that will help someone else. Join in! app/views/categories/_tips.html.haml @@ -3,24 +3,24 @@ #yui-main .yui-b.box - %h3 Editing category + %h3="Editing category".l - form_for(:category, :url => category_path(@category), :html => { :method => :put, :class => "MainForm" }) do |f| - %label Name: + %label="Name:".l = f.text_field :name - %label Posting tips: + %label="Posting tips:".l = f.text_area :tips, :rows => 3 - %label New Post text: + %label="New Post text:".l = f.text_field :new_post_text - %label Navigation menu text: + %label="Navigation menu text:".l = f.text_field :nav_text %p - = submit_tag "Update" + = submit_tag "Update".l - = link_to 'Show', category_path(@category) + = link_to 'Show'.l, category_path(@category) | - = link_to 'Back', categories_path + = link_to 'Back'.l, categories_path app/views/categories/edit.html.haml @@ -4,25 +4,27 @@ #yui-main .yui-b .box - %h3 Categories + %h3="Categories".l %table{:width=>"100%"} %tr - %th Name - %th # Posts - %th Actions + %th="Name".l + %th + \# + ="Posts".l + %th="Actions".l - for category in @categories %tr %td= category.name %td= category.posts.size %td - = link_to 'Show', category_path(category) + = link_to 'Show'.l, category_path(category) | - = link_to 'Edit', edit_category_path(category) + = link_to 'Edit'.l, edit_category_path(category) | - = link_to 'Destroy', category_path(category), :confirm => 'Are you sure?', :method => :delete + = link_to 'Destroy'.l, category_path(category), :confirm => 'Are you sure?'.l, :method => :delete %br - = link_to 'New category', new_category_path \ No newline at end of file + = link_to 'New category'.l, new_category_path \ No newline at end of file app/views/categories/index.html.haml @@ -4,6 +4,6 @@ - form_for(:category, :url => categories_path, :html => {:class => "MainForm"}) do |f| %label Name = f.text_field :name - %p= submit_tag "Create" + %p= submit_tag "Create".l - = link_to 'Back', categories_path \ No newline at end of file + = link_to 'Back'.l, categories_path \ No newline at end of file app/views/categories/new.html.haml @@ -4,26 +4,26 @@ .yui-b .box - if logged_in? - %h3= "Have something to contribute?" + %h3="Have something to contribute?".l %ul.list.checks - %li= link_to @category.display_new_post_text, new_user_post_path({:user_id => current_user, 'post[category_id]' => @category.id}) + %li= link_to @category.display_new_post_text() || :write_new_post.l(:category=>@category.name), new_user_post_path({:user_id => current_user, 'post[category_id]' => @category.id}) - else - %h3= "Want to post in this category?" + %h3="Want to post in this category?".l %ul.list.checks %li - %a{:href=>"/signup", :title=>"Sign up for a #{AppConfig.community_name} account"} Sign up for an account. + %a{:href=>"/signup", :title=>"Sign up for a #{AppConfig.community_name} account"}="Sign up for an account.".l %br %small - Have an account? - %a{:href=>"/login", :title=>"Log in to your #{AppConfig.community_name} account"} &raquo;Login + ="Have an account? ".l + %a{:href=>"/login", :title=>"Log in to your #{AppConfig.community_name} account"}="&raquo; " + "Login".l .box.alt - %h3 Top Writers + %h3="Top Writers".l - @active_users.each do |user| = render :partial => "users/sidebar_user", :locals => {:user => user} .box.alt - %h3= "Popular #{@category.name}" + %h3=:popular_catgory.l(:name => @category.name) %ul.list.page - @popular_posts.each do |post| =render :partial => 'posts/sidebar_post', :locals => {:post => post} @@ -33,10 +33,10 @@ .yui-b .box.hfeed %h3 - =@category.name + =:show_category.l :category => @category.name %ul.subnav - %li= link_to "Recent", category_path(@category), {:class => (params[:popular] ? '' : 'active')} - %li= link_to "Popular", category_path(:popular => 'DESC'), {:class => (params[:popular] ? 'active' : '')} + %li= link_to "Recent".l, category_path(@category), {:class => (params[:popular] ? '' : 'active')} + %li= link_to "Popular".l, category_path(:popular => 'DESC'), {:class => (params[:popular] ? 'active' : '')} = render :partial => 'posts/post', :collection => @posts = pagination_info_for @pages app/views/categories/show.html.haml @@ -8,7 +8,7 @@ - if @related.any? .box.alt - %h3 Related Clippings (all members) + %h3="Related Clippings (all members)".l .centered - @related.each do |clipping| = link_to image_tag(clipping.image_uri, :class => "related_clipping polaroid", :alt => clipping.description), user_clipping_url(clipping.user, clipping) @@ -33,18 +33,18 @@ = h truncate(@clipping.url, 95) %p - Description: + ="Description:".l =h @clipping.description %p - Tags: + ="Tags:".l %ul.tags - @clipping.tags.each do |t| %li=link_to( t.name, tag_url(t.name), :rel => 'tag') #comments.box.hfeed.comments - %h3 Clipping Comments - %h2 Add Your Comment! + %h3="Clipping Comments".l + %h2="Add Your Comment!".l %p= render :partial => 'comments/comment_form', :locals => {:commentable => @clipping} %a#newest_comment = render :partial => 'comments/comment', :collection => @clipping.comments app/views/clippings/show.html.haml @@ -13,12 +13,12 @@ .errors - form_remote_for(:comment, :loading => "$$('div#comments div.errors')[0].innerHTML = ''; $('comment_spinner').show();", :before => "tinyMCE.activeEditor.save();", :url => comments_url(Inflector.underscore(commentable.class), commentable.id ), 500 => "$$('div#comments div.errors')[0].innerHTML = request.responseText; return false;", :success => "new Insertion.#{commentable.class.to_s.eql?('User') ? 'After': 'After' }('newest_comment', request.responseText); tinyMCE.activeEditor.setContent(\'\'); scrollToNewestComment();", :complete => "$('comment_spinner').hide();", :html => {:class => "MainForm"}) do |f| %label - %em (2000 character limit) + %em="(2000 character limit)".l = text_area :comment, :comment, {:size => "86x5", :class => "rich_text_editor"} %p - = submit_tag "Add Comment" + = submit_tag "Add Comment".l = image_tag 'spinner.gif', :plugin => "community_engine", :style => 'display:none;', :id => 'comment_spinner' - else - = link_to "Log in to leave a comment", new_comment_path(commentable.class, commentable.id) + = link_to "Log in to leave a comment".l, new_comment_path(commentable.class, commentable.id) or - = link_to "Create an account", signup_path + = link_to "Create an account".l, signup_path app/views/comments/_comment_form.html.haml @@ -5,7 +5,7 @@ .yui-b#comments.box.hfeed.comments %h3 = Inflector.underscore(@commentable.class).capitalize - Comments - + ="Comments -".l = link_to @title, @comments.first.generate_commentable_url(false) %a#newest_comment @@ -15,6 +15,6 @@ = pagination_info_for @pages = pagination_links_for @pages, {:link_to_current_page => true} if @pages.length > 1 - %h3 Add Your Comment! + %h3="Add Your Comment!".l %p= render :partial => 'comments/comment_form', :locals => {:commentable => @commentable} \ No newline at end of file app/views/comments/index.html.haml @@ -3,7 +3,7 @@ .yui-b - if @is_admin_user .box.alt.first_alt - = link_to "Post an event", new_event_path + = link_to "Post an event".l, new_event_path .box %h3 Events @@ -17,9 +17,9 @@ - @events.each do |event| %h3= event.name - if event.user.eql?(current_user) - = link_to "Edit this event", edit_event_path(event) + = link_to "Edit this event".l, edit_event_path(event) | - = link_to("Delete this event", event_path(event), {:method => :delete, :confirm => 'Permanently delete this event?'}) + = link_to("Delete this event".l, event_path(event), {:method => :delete, :confirm => 'Permanently delete this event?'.l}) %strong= h event.time_and_date %br %strong= h event.location app/views/events/index.html.haml @@ -1,5 +1,5 @@ .box - %h3 Friendship request detail + %h3="Friendship request detail".l - if @friendship.initiator? && @friendship.pending? Waiting for = @friendship.friend.login app/views/friendships/show.html.haml @@ -6,9 +6,9 @@ <% for invitation in @invitations %> <tr> - <td><%= link_to 'Show', user_invitation_path(invitation) %></td> - <td><%= link_to 'Edit', edit_user_invitation_path(invitation) %></td> - <td><%= link_to 'Destroy', user_invitation_path(invitation), :confirm => 'Are you sure?', :method => :delete %></td> + <td><%= link_to 'Show'.l, user_invitation_path(invitation) %></td> + <td><%= link_to 'Edit'.l, edit_user_invitation_path(invitation) %></td> + <td><%= link_to 'Destroy'.l, user_invitation_path(invitation), :confirm => 'Are you sure?', :method => :delete %></td> </tr> <% end %> </table> app/views/invitations/index.rhtml @@ -1,3 +1,3 @@ -<%= link_to 'Edit', edit_user_invitation_path(@invitation) %> | -<%= link_to 'Back', user_invitations_path %> \ No newline at end of file +<%= link_to 'Edit'.l, edit_user_invitation_path(@invitation) %> | +<%= link_to 'Back'.l, user_invitations_path %> \ No newline at end of file app/views/invitations/show.rhtml @@ -26,7 +26,7 @@ -if show_footer_content? .yui-gc#footer_content = image_tag 'spinner.gif', :plugin => 'community_engine' - Loading recent content... + ="Loading recent content...".l %script{:type=>"text/javascript"} = remote_function(:update => "footer_content", :url => { :controller => 'base', :action => 'footer_content' }) @@ -34,18 +34,23 @@ #CommunityFooter %ul %li - %a{:href=>"/", :title=>"#{AppConfig.community_name} Home"} Home + %a{:href=>"/", :title=>"#{AppConfig.community_name} Home"}= "Home".l - if !logged_in? %li - = link_to "Log in", login_path + = link_to "Log In".l , login_path - else %li - %a{:href=>"/logout", :title=>"Log out of your #{AppConfig.community_name} account"} Log out + %a{:href=>"/logout", :title=>"Log out of your #{AppConfig.community_name} account"} + ="Log Out".l %li - %a{:href=>"/about", :title=>"What is #{AppConfig.community_name}?"} About + %a{:href=>"/about", :title=>"What is #{AppConfig.community_name}?"} + ="About".l %li - %a{:href=>"/faq", :title=>"Frequent Asked Questions"} FAQ + %a{:href=>"/faq", :title=>"Frequent Asked Questions".l} + ="FAQ".l + - if @rss_title && @rss_url - %li#rss= link_to 'RSS', @rss_url, {:title => @rss_title} + %li#rss= link_to "RSS".l, @rss_url, {:title => @rss_title} - %p= AppConfig.community_tagline \ No newline at end of file + %p + = :community_tagline.l \ No newline at end of file app/views/layouts/application.html.haml @@ -1,19 +1,19 @@ .box - %h3 Showing Metro Area Details + %h3="Showing Metro Area Details".l %p %b - Country: + ="Country:".l = h @metro_area.country.name %p %b - State: + ="State:".l = @metro_area.state.name if @metro_area.state %p %b - Name: + ="Name:".l = @metro_area.name - = link_to 'Edit', edit_metro_area_path(@metro_area) + = link_to 'Edit'.l, edit_metro_area_path(@metro_area) | - = link_to 'Back', metro_areas_path + = link_to 'Back'.l, metro_areas_path app/views/metro_areas/show.html.haml @@ -5,7 +5,7 @@ .yui-b .yui-gd #tag_list.yui-u.box.first - %h3 Tags + %h3="Tags".l %ul.tags - @tags.each do |tag| %li @@ -15,8 +15,8 @@ = link_to tag.name, user_photos_path(:user_id => @user, :tag_name => tag.name) #photos.yui-u.box - %h3= link_to "#{@user.login}'s photos", user_photos_path(@user) - = link_to( 'New photo.', new_user_photo_path(@user), {:class => 'right'}) if @is_current_user + %h3= link_to :users_photos.l(:user=>@user.login), user_photos_path(@user) + = link_to( 'New photo.'.l, new_user_photo_path(@user), {:class => 'right'}) if @is_current_user .clear - @photos.each do |photo| app/views/photos/index.html.haml @@ -9,7 +9,7 @@ - if @related.any? .box.alt - %h3 Related Photos (all members) + %h3="Related Photos (all members)".l .centered - @related.each do |photo| = link_to image_tag( photo.public_filename(:thumb), :class => "polaroid"), user_photo_path(photo.user, photo), {:title => "#{h(photo.description)} from #{photo.user.login}"} @@ -34,8 +34,8 @@ %p= @photo.tags.collect{|t| link_to( h(t.name), tag_url(t.name), :class => 'tag') }.join(" ") #comments.box.hfeed.comments - %h3 Photo Comments - %h2 Add Your Comment! + %h3="Photo Comments".l + %h2="Add Your Comment!".l %p= render :partial => 'comments/comment_form', :locals => {:commentable => @photo} %a#newest_comment = render :partial => 'comments/comment', :collection => @photo.comments app/views/photos/show.html.haml @@ -1,17 +1,20 @@ .box - %h3 Author + %h3="Author".l %dl.vcard %dt.photo = link_to image_tag( user.avatar_photo_url(:thumb), "height"=>"50", "alt"=>"#{user.login}", "width"=>"50" ), user_path(user), :title => "#{user.login}'s profile" %dd.fn = link_to user.login, user_path(user), :class => 'url' - = " <small>(#{AppConfig.featured_writer_label})</small>" if user.featured_writer? + = " <small>(" + "Featured Writer".l + ")</small>" if user.featured_writer? %dd - if user.description = truncate_words( user.description, 12, '...') %dd.member =user.created_at.strftime("Member since: %m/%d/%y") %dd.post - = link_to "#{pluralize user.posts.count, 'posts'}", user_posts_path(user) + - if user.posts.count == 1 + = link_to :singular_posts.l(:count => user.posts.count), user_posts_path(user) + - else + = link_to :plural_posts.l(:count => user.posts.count), user_posts_path(user) %dd.rss - =link_to 'RSS feed', formatted_user_posts_path(user, 'rss') \ No newline at end of file + =link_to 'RSS feed'.l, formatted_user_posts_path(user, 'rss') \ No newline at end of file app/views/posts/_author_profile.html.haml @@ -8,7 +8,7 @@ :success => "alert('Messages sent!'); Element.toggle('send_to_friend'); Lightbox.hideAll(); return false;" } ) do -%> <div class="errors"></div> - <h3>Send this story to friends</h3> + <h3><%= "Send this story to friends".l %> </h3> <p> Enter a message: <br /> <input type="text" name="message" value="This story is awesome!" style="width:100%"/> app/views/posts/_send_to_friend.rhtml @@ -10,26 +10,26 @@ #yui-main .yui-b .box - %h3 Editing post + %h3="Editing post".l = error_messages_for :post - form_for(:post, :url => user_post_path(@user, @post), :html => { :method => :put, :class =>'MainForm' }) do |f| %label - Title + ="Title".l %em (required) = f.text_field :title %label Category: = f.collection_select(:category_id, Category.find(:all), :id, :name, {}, {}) %label - Body Text + ="Body Text ".l %em (required) = f.text_area :raw_post, :size => "86x15" %label - Tags: + ="Tags:".l = text_field_tag 'tag_list', @post.tags.collect{|t| t.name}.join(", "), {:autocomplete => "off", :size => 35} #tag_list_auto_complete.auto_complete = auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [',', ' '] } - %label Save post as: + %label="Save post as:".l = f.select(:published_as, [['Published', 'live'], ['Draft', 'draft']]) %p = submit_tag "Update" app/views/posts/edit.html.haml @@ -3,7 +3,7 @@ - unless @popular_posts.empty? #posts.box.alt - %h3 Popular Posts + %h3="Popular Posts".l %ul.list.page - @popular_posts.each do |post| %li= link_to truncate(post.title, 75), user_post_path(@user, post) @@ -12,10 +12,10 @@ .yui-b .box.posts.hfeed %h3 - = link_to "#{@user.login}'s blog", user_posts_path(@user) + = link_to :users_blog.l(:user => @user.login), user_posts_path(@user) = @category ? "&raquo; " + link_to(@category.name.upcase, users_posts_in_category_path(@user, @category.name)) : '' - = link_to( 'New post.', new_user_post_path(@user), {:class => "right"}) if @is_current_user + = link_to( 'New post'.l, new_user_post_path(@user), {:class => "right"}) if @is_current_user %br = render :partial => 'post', :collection => @posts app/views/posts/index.html.haml @@ -1,16 +1,16 @@ .yui-b.sidebar .box - %h3 Links + %h3="Links".l %ul.checks - %li=link_to 'View my blog', user_posts_path(current_user) - %li=link_to 'New post', new_user_post_path(current_user) + %li=link_to 'View my blog'.l, user_posts_path(current_user) + %li=link_to 'New post'.l, new_user_post_path(current_user) #yui-main .yui-b .box %h3 - Manage Posts - %p Posts saved with 'draft' status won't appear in your blog until you publish them. + ="Manage Posts".l + %p="Posts saved with 'draft' status won't appear in your blog until you publish them.".l -if @posts.page_count > 1 @@ -19,13 +19,13 @@ %table{:border => 0, :width => '100%'} %thead %tr - %th Date Created - %th Date Published - %th Title - %th Category - %th Tags - %th Comments - %th Status + %th="Date Created".l + %th="Date Published".l + %th="Title".l + %th="Category".l + %th="Tags".l + %th="Comments".l + %th="Status".l %tbody - @posts.each do |post| %tr @@ -35,6 +35,6 @@ %abbr{:title=>"#{post.published_at}"}= post.published_at_display %td= link_to post.title, edit_user_post_path(post.user, post) %td= post.category.name - %td= post.tags.any? ? post.tag_list : 'No tags' + %td= post.tags.any? ? post.tag_list : 'No tags'.l %td= post.comments.count - %td= post.is_live? ? link_to('published', user_post_path(post.user, post)) : 'draft' \ No newline at end of file + %td= post.is_live? ? link_to('published'.l, user_post_path(post.user, post)) : 'draft'.l \ No newline at end of file app/views/posts/manage.html.haml @@ -8,19 +8,19 @@ = render :partial => "/categories/tips", :locals => {:category => nil} .box.alt - %a.button.positive{:href => '#', :onclick => "tinyMCE.execCommand('mceCurblyAdvImage');return false;"} Upload an image for your post + %a.button.positive{:href => '#', :onclick => "tinyMCE.execCommand('mceCurblyAdvImage');return false;"}="Upload an image for your post".l #yui-main .yui-b .box %h3 - = "New #{@post.category ? Inflector.singularize(@post.category.name) : 'post'}" + =@post.category ? (:new_post_for_category.l :category => @post.category.name) : "New Post".l = error_messages_for :post - form_for(:post, :url => user_posts_path, :html => {:class => "MainForm"}) do |f| - unless @post.category || @post.contest %label - Category: + ="Category:".l %select{:id=>"post_category_id", :name=>"post[category_id]"} -for category in Category.find(:all) %option{:value=>"#{category.id}", :selected => category.eql?(Category.get(:talk)) }= h(category.name) @@ -29,37 +29,37 @@ = f.hidden_field :contest_id %label - Title - %em (required) + ="Title".l + %em="(required)".l = f.text_field :title %label - Body Text - %em (required) + ="Body Text".l + %em="(required)".l = f.text_area :raw_post, :style => "width:100%;" %label - Tags - %em="(optional keywords describing this post, separated by spaces)" + ="Tags".l + %em="(optional keywords describing this post, separated by commas)".l = text_field_tag 'tag_list', @post.tags.collect{|t| t.name}.join(", "), {:autocomplete => "off", :size => 35} .auto_complete#tag_list_auto_complete = auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [',', ' '] } %label %a{:href=> "#", :onclick => "$('poll-ui').toggle(); return false;"} - = "#{image_tag 'icons/poll.png', :plugin => 'community_engine' } Add a poll" - %em (optional) + = "#{image_tag 'icons/poll.png', :plugin => 'community_engine' } " + "Add a poll".l + %em="(optional)".l #poll-ui{:style => 'display:none'}=render :partial => 'polls/new' %label - Save post as: + ="Save post as:".l = f.select(:published_as, [['Published', 'live'], ['Draft', 'draft']]) %p - = submit_tag "Save" + = submit_tag "Save".l %p or - = link_to 'cancel and go back to my posts', user_posts_path(@user) + = link_to 'cancel and go back to my posts'.l, user_posts_path(@user) = observe_field "post_category_id", {:url => {:controller => 'categories', :action => 'show_tips'}, :with => "id", :update => "category_tips", :complete => visual_effect(:highlight, "category_tips", :duration => 0.5)} app/views/posts/new.html.haml @@ -3,18 +3,20 @@ .yui-b .box - if logged_in? - %h3= "Get popular." + %h3= "Get popular.".l %ul.list.checks - %li=link_to "Write a blog post!", new_user_post_path({:user_id => current_user}) + %li=link_to "Write a blog post!".l, new_user_post_path({:user_id => current_user}) - else %h3= "Want to be popular?" %ul.list.checks %li - %a{:href=>"/signup", :title=>"Sign up for a #{AppConfig.community_name} account"} Sign up for an account. + %a{:href=>"/signup", :title=>"Sign up for a #{AppConfig.community_name} account"}="Sign up for an account.".l %br %small Have an account? - %a{:href=>"/login", :title=>"Log in to your #{AppConfig.community_name} account"} &raquo;Login + %a{:href=>"/login", :title=>"Log in to your #{AppConfig.community_name} account"} + &raquo; + ="Log in".l .box.alt %h3= "This month's Best" @@ -26,7 +28,7 @@ .yui-b .box.hfeed %h3 - What's Popular + ="What's Popular".l :what_is_popular %ul.subnav - %li= "(looking for #{link_to "recent", recent_path}?)" + %li= "(looking for {link}?)".l :looking_for_most_x, :link => link_to("recent".l, recent_path) = render :partial => 'posts/post', :collection => @posts \ No newline at end of file app/views/posts/popular.html.haml @@ -2,11 +2,11 @@ .yui-b .box - if logged_in? - %h3= "Get popular." + %h3= "Get popular.".l %ul.list.checks - %li=link_to "Write a blog post!", new_user_post_path({:user_id => current_user}) + %li=link_to "Write a blog post!".l, new_user_post_path({:user_id => current_user}) - else - %h3= "Want to be popular?" + %h3= "Want to be popular?".l %ul.list.checks %li %a{:href=>"/signup", :title=>"Sign up for a #{AppConfig.community_name} account"} Sign up for an account. @@ -18,10 +18,10 @@ #yui-main .yui-b .box.hfeed - %h3 - Recent Posts + %h3 + =:recent_posts.l %ul.subnav - %li= "(looking for #{link_to "popular", popular_path}?)" + %li= "(looking for {link}?)".l :looking_for_most_x, :link => link_to("popular".l, popular_path) = render :partial => 'posts/post', :collection => @posts app/views/posts/recent.html.haml @@ -6,7 +6,7 @@ #yui-main .yui-b .box.hfeed - %h3= "#{@user.login}'s Blog" + %h3=:users_blog.l :user=> @user.login .hentry.main %h4.entry-title= link_to @post.title, user_post_path(@user, @post), :rel => 'bookmark' .vcard.author @@ -65,14 +65,14 @@ - unless @related.empty? .box.alt - %h3 Related Posts + %h3="Related Posts".l %ul.list.page - @related.each do |post| %li=link_to truncate(post.title, 75), user_post_path(post.user, post) - unless @popular_posts.empty? .box.alt - %h3 Popular Posts + %h3="Popular Posts".l %ul.list.page - @popular_posts.each do |post| %li=link_to truncate(post.title, 75), user_post_path(post.user, post) app/views/posts/show.html.haml @@ -5,16 +5,15 @@ .yui-b.main_column .box %h3 - Log in to - = AppConfig.community_name + =:log_in_to_site.l(:site => AppConfig.community_name) - form_tag sessions_path, :class => 'MainForm' do - %label{"for"=>"username"} Username: + %label{"for"=>"username"}="Username:".l = text_field_tag 'login', nil, :size => 35 - %label{"for"=>"password"} Password: + %label{"for"=>"password"}="Password:".l = password_field_tag 'password', nil, :size => 35 %fieldset - %label{"for"=>"remember_me"} - Remember me + %label{"for"=>"remember_me"} + ="Remember me".l = check_box_tag 'remember_me' %p - = submit_tag 'Log in' + = submit_tag 'Log in'.l app/views/sessions/new.html.haml @@ -1,16 +1,16 @@ .box - %h3 Admin + %h3="Admin".l %ul.list.checks - %li= link_to "Features", homepage_features_path + %li= link_to "Features".l, homepage_features_path - if feature_enabled?('categories') - %li= link_to "Categories", categories_path + %li= link_to "Categories".l, categories_path - if feature_enabled?('contests') - %li= link_to "Contests", contests_path - %li= link_to "Metro areas", metro_areas_path + %li= link_to "Contests".l, contests_path + %li= link_to "Metro areas".l, metro_areas_path - if feature_enabled?('skills') - %li= link_to "Skills", new_skill_path + %li= link_to "Skills".l, new_skill_path - if feature_enabled?('events') - %li= link_to "Events", events_path - %li= link_to "Statistics", statistics_path - %li= link_to "Ads", ads_path + %li= link_to "Events".l, events_path + %li= link_to "Statistics".l, statistics_path + %li= link_to "Ads".l, ads_path app/views/shared/_admin_nav.html.haml @@ -1,11 +1,11 @@ .yui-u.first .box.fresh - %h3 What's fresh + %h3="What's fresh".l - @recent_activity.each do |activity| =render :partial => "activities/activity", :locals => {:activity => activity } .yui-u .box - %h3 Tags + %h3="Tags".l - tag_cloud @popular_tags, %w(nube1 nube2 nube3 nube4 nube5) do |name, css_class| = link_to name, tag_path(name), :class => css_class app/views/shared/_footer_content.html.haml @@ -6,20 +6,17 @@ = render :partial => 'shared/user_menu' - else %h2 - Welcome, - =link_to "Log in", login_path - or - =link_to "Sign up", signup_path + =:welcome_message.l(:login_link => (link_to "Log in".l, login_path), :signup_link => (link_to "Sign up".l, signup_path)) #NavBar %ul - Category.find(:all).each do |c| = topnav_tab c.name, {:url => category_path(c), :section => c.name} - = topnav_tab "Forums", { :url => forums_path, :section => 'forums' } - = topnav_tab "Popular", { :url => popular_path, :section => 'popular' } - = topnav_tab "People", { :url => users_path, :section => 'users' } + = topnav_tab "Forums".l, { :url => forums_path, :section => 'forums' } + = topnav_tab "Popular".l, { :url => popular_path, :section => 'popular' } + = topnav_tab "People".l, { :url => users_path, :section => 'users' } - if current_user - = topnav_tab "My Profile", { :url => user_path(current_user), :section => 'my_profile'} + = topnav_tab "My Profile".l, { :url => user_path(current_user), :section => 'my_profile'} / SiteSearch Google %form{:method=>"get", :action=>"http://www.google.com/custom", :target=>"_top"} app/views/shared/_header.html.haml @@ -1,10 +1,10 @@ %span#location_chooser - Country: + ="Country:".l %br = select_tag(:country_id, '<option></option>'+options_from_collection_for_select(Country.find_countries_with_metros, "id", "name", selected_country), {:style => "width:100px"}) - = "<br />State: <br />" + select_tag(:state_id, '<option></option>'+options_from_collection_for_select(State.find(:all), "id", "name", (selected_state rescue nil)), {:style => "width:100px", :disabled => states.empty? } ) + = "<br />"+"State:".l+" <br />" + select_tag(:state_id, '<option></option>'+options_from_collection_for_select(State.find(:all), "id", "name", (selected_state rescue nil)), {:style => "width:100px", :disabled => states.empty? } ) = image_tag 'spinner.gif', :plugin => 'community_engine', :style => 'display:none;' - = "<br />Metro Area: <br />" + select_tag(:metro_area_id, options_from_collection_for_select(metro_areas, "id", "name", (selected_metro_area rescue nil)), {:style => "width:100px", :disabled => metro_areas.empty? } ) + = "<br />" + "Metro Area:".l + "<br />" + select_tag(:metro_area_id, options_from_collection_for_select(metro_areas, "id", "name", (selected_metro_area rescue nil)), {:style => "width:100px", :disabled => metro_areas.empty? } ) = image_tag 'spinner.gif', :plugin => 'community_engine', :style => 'display:none;' -= observe_field "state_id", {:url => {:controller => 'users', :action => 'metro_area_update'}, :with => "state_id", :loading => "$$('span#location_chooser img')[0].show();", 500 => "alert('Sorry, there was an error.'); return false", :update => "location_chooser"} -= observe_field "country_id", {:url => {:controller => 'users', :action => 'metro_area_update'}, :with => "country_id", :loading => "$$('span#location_chooser img')[0].show();", 500 => "alert('Sorry, there was an error.'); return false", :update => "location_chooser"} += observe_field "state_id", {:url => {:controller => 'users', :action => 'metro_area_update'}, :with => "state_id", :loading => "$$('span#location_chooser img')[0].show();", 500 => "alert('Sorry, there was an error.'.l); return false", :update => "location_chooser"} += observe_field "country_id", {:url => {:controller => 'users', :action => 'metro_area_update'}, :with => "country_id", :loading => "$$('span#location_chooser img')[0].show();", 500 => "alert('Sorry, there was an error.'.l); return false", :update => "location_chooser"} app/views/shared/_location_chooser.html.haml @@ -1,14 +1,14 @@ .box - %h3 Help + %h3="Help".l %p - Don't have an account? + ="Don't have an account?".l %br/ - = link_to "&raquo; Click here to sign up", "/signup" + = link_to "&raquo; " + "Click here to sign up".l, "/signup" %p - Forgot your password? + ="Forgot your password?".l %br/ - = link_to "&raquo; Click here to retrieve it", forgot_password_url + = link_to "&raquo; " + "Click here to retrieve it".l, forgot_password_url %p - Forgot your username? + ="Forgot your username?".l %br/ - = link_to "&raquo; Click here to retrieve it", forgot_username_url \ No newline at end of file + = link_to "&raquo; " + "Click here to retrieve it".l, forgot_username_url \ No newline at end of file app/views/shared/_login_sidebar.html.haml @@ -3,6 +3,6 @@ .warning.flash_message{:class => "#{type.to_s}"} %span= h(flash[type.to_sym]) %small - %a{:href=>"#", :onclick=>"$$('div.flash_message')[0].hide();return false"} Close this message + %a{:href=>"#", :onclick=>"$$('div.flash_message')[0].hide();return false"}="Close this message".l app/views/shared/_messages.html.haml @@ -16,7 +16,7 @@ = javascript_include_tag 'uploader', :plugin => "community_engine" -= stylesheet_link_tag 'http://yui.yahooapis.com/2.5.1/build/reset-fonts-grids/reset-fonts-grids.css' += stylesheet_link_tag 'reset-fonts-grids.css', :plugin => :community_engine = stylesheet_link_tag 'screen', :plugin => :community_engine app/views/shared/_scripts_and_styles.html.haml @@ -1,19 +1,21 @@ -%h2="Logged in: #{link_to current_user.login, dashboard_user_path(current_user), :id => 'user-menu'}" +%h2 + ="Logged in:".l + = link_to current_user.login, dashboard_user_path(current_user), :id => 'user-menu' #user-menu-tip %ul -if current_user.admin? - %li=link_to 'Admin dashboard', admin_dashboard_path - %li= link_to "Edit profile", edit_user_path(current_user) - %li= link_to "Edit account", edit_account_user_path(current_user) - %li= link_to "View profile", user_path(current_user) + %li=link_to 'Admin dashboard'.l, admin_dashboard_path + %li= link_to "Edit profile".l, edit_user_path(current_user) + %li= link_to "Edit account".l, edit_account_user_path(current_user) + %li= link_to "View profile".l, user_path(current_user) %hr %ul - %li=link_to 'Blog', manage_user_posts_path(current_user) - %li=link_to 'Photos', user_photos_path(current_user) - %li=link_to 'Clippings', user_clippings_path(current_user) - %li=link_to 'Friends', accepted_user_friendships_path(current_user) + %li=link_to 'Blog'.l, manage_user_posts_path(current_user) + %li=link_to 'Photos'.l, user_photos_path(current_user) + %li=link_to 'Clippings'.l, user_clippings_path(current_user) + %li=link_to 'Friends'.l, accepted_user_friendships_path(current_user) %hr - =link_to 'Log out', logout_path + =link_to 'Log out'.l, logout_path %script{:type => "text/javascript"} :plain app/views/shared/_user_menu.html.haml @@ -12,41 +12,41 @@ .box - %h3.tags Related Tags + %h3.tags="Related Tags".l %ul - tag_cloud @related_tags, %w(nube1 nube2 nube3 nube4 nube5) do |name, css_class| - css_class = css_class + (name.eql?(params[:id]) ? " selected": "") %li= link_to h(name), tag_path(name), :class => css_class - %h6.all= link_to "All tags", tags_path + %h6.all= link_to "All tags".l, tags_path #yui-main .yui-b.box - if @posts.any? #posts - %h3 Posts + %h3="Posts".l %ul.list.page - @posts.each do |post| %li = link_to( truncate(post.display_title, 75), user_post_path(post.user, post), :title => "by #{post.user.login}" ) %p.post_excerpt= truncate_words(post.post, 35, '...' ) - %h6.all= link_to "All posts tagged #{@tag.name}", tag_path(:id => @tag.name, :type => 'Post') + %h6.all= link_to :all_posts_tagged.l(:tag_name => @tag.name), tag_path(:id => @tag.name, :type => 'Post') - if @photos.any? %br.clear - %h3 Photos + %h3="Photos".l - @photos.each do |photo| = link_to image_tag(photo.public_filename(:thumb), :title => "#{photo.description} (uploaded by #{photo.user.login})", :class => "polaroid"), user_photo_path(photo.user, photo) - %h6.all= link_to "All photos tagged #{@tag.name}", tag_path(:id => @tag.name, :type => 'Photo') + %h6.all= link_to :all_photos_tagged.l(:tag_name => @tag.name), tag_path(:id => @tag.name, :type => 'Photo') - if @users.any? .user - %h3 Users + %h3="Users".l - @users.each do |user| = link_to image_tag(user.avatar_photo_url(:thumb), :class => "polaroid"), user_path(user), :title => user.login - %h6.all= link_to "All users tagged #{@tag.name}", tag_path(:id => @tag.name, :type => 'User') + %h6.all= link_to :all_users_tagged.l(:tag_name => @tag.name), tag_path(:id => @tag.name, :type => 'User') - unless @clippings.empty? @@ -55,4 +55,4 @@ - @clippings.each do |clipping| %a{"href"=>"#{h user_clipping_url(clipping.user, clipping) }"} %img.polaroid.clipping{"src"=>"#{h clipping.image_uri}", "style"=>"width:108px"} - %h6.all= link_to "All clippings tagged #{@tag.name}", tag_path(:id => @tag.name, :type => 'Clipping') + %h6.all= link_to :all_clippngs_tagged.l(:tag_name => @tag.name), tag_path(:id => @tag.name, :type => 'Clipping') app/views/tags/show.html.haml @@ -2,20 +2,20 @@ .yui-u.first %h3 View my: %ul - %li=link_to 'Profile', user_path(@user) - %li=link_to 'Blog', user_posts_path(@user) - %li=link_to 'Photos', user_photos_path(@user) - %li=link_to 'Clippings', user_clippings_path(@user) - %li=link_to 'Friends', accepted_user_friendships_path(@user) + %li=link_to 'Profile'.l, user_path(@user) + %li=link_to 'Blog'.l, user_posts_path(@user) + %li=link_to 'Photos'.l, user_photos_path(@user) + %li=link_to 'Clippings'.l, user_clippings_path(@user) + %li=link_to 'Friends'.l, accepted_user_friendships_path(@user) .yui-u %h3 Manage my: %ul - %li=link_to 'Profile', edit_user_path(@user) - %li=link_to 'Account settings', edit_account_user_path(@user) - %li=link_to 'Blog posts', manage_user_posts_path(@user) + %li=link_to 'Profile'.l, edit_user_path(@user) + %li=link_to 'Account settings'.l, edit_account_user_path(@user) + %li=link_to 'Blog posts'.l, manage_user_posts_path(@user) -if current_user.admin? - %li=link_to 'Admin dashboard', admin_dashboard_path + %li=link_to 'Admin dashboard'.l, admin_dashboard_path .box.alt %h3 Stats app/views/users/_dashboard_nav.html.haml @@ -2,25 +2,25 @@ .yui-b .box - %h3 Dashboard + %h3="Dashboard".l .yui-g .yui-u.first - View my: + ="View my:".l %ul - %li=link_to 'Profile', user_path(@user) - %li=link_to 'Blog', user_posts_path(@user) - %li=link_to 'Photos', user_photos_path(@user) - %li=link_to 'Clippings', user_clippings_path(@user) - %li=link_to 'Friends', accepted_user_friendships_path(@user) + %li=link_to 'Profile'.l, user_path(@user) + %li=link_to 'Blog'.l, user_posts_path(@user) + %li=link_to 'Photos'.l, user_photos_path(@user) + %li=link_to 'Clippings'.l, user_clippings_path(@user) + %li=link_to 'Friends'.l, accepted_user_friendships_path(@user) .yui-u - Manage my: + ="Manage my:".l %ul - %li=link_to 'Profile', edit_user_path(@user) - %li=link_to 'Account settings', edit_account_user_path(@user) - %li=link_to 'Blog posts', manage_user_posts_path(@user) + %li=link_to 'Profile'.l, edit_user_path(@user) + %li=link_to 'Account settings'.l, edit_account_user_path(@user) + %li=link_to 'Blog posts'.l, manage_user_posts_path(@user) .box.alt - %h3 Stats + %h3="Stats".l %ul %li="You last logged in on #{@user.last_login_at && @user.last_login_at.strftime("%m/%d/%y")}" %li= @user.created_at.strftime("Member since: %m/%d/%y") @@ -48,26 +48,25 @@ -if @network_activity.empty? && @recommended_posts.empty? %p - This is your dashboard. + ="This is your dashboard.".l %br - Once you start adding friends, you'll be able to track their activity on - =AppConfig.community_name - here. + =:dashboard_friends.l :site => AppConfig.community_name + %p - To start adding friends, you can - =link_to 'browse all members', users_path + ="To start adding friends, you can".l :to_start_adding_friends + =link_to 'browse all members'.l, users_path %p - =link_to 'Update your profile and tag yourself', edit_user_path(current_user) - to start getting recommended content on your dashboard. + =link_to 'Update your profile and tag yourself'.l(:update_profile_and_tag_yourself), edit_user_path(current_user) + ="to start getting recommended content on your dashboard.".l(:to_get_recommended_content_on_your_dashboard) -unless @network_activity.empty? - %h2 Activity from your network + %h2="Activity from your network".l .box.fresh =render :partial => "activities/activity", :collection => @network_activity -unless @recommended_posts.empty? - %h3 Recommended Posts + %h3="Recommended Posts".l #posts %ul -@recommended_posts.each do |post| app/views/users/dashboard.html.haml @@ -1,50 +1,50 @@ - form_tag user_url(@user), :method => 'put', :multipart =>true, :class => 'MainForm' do .box.alt.first_alt - %h3 You're editing your profile. + %h3="You're editing your profile.".l = link_to "&raquo; Edit your account settings instead?", edit_account_user_path(@user) = error_messages_for :user - %p= submit_tag 'Save Changes' + %p= submit_tag 'Save Changes'.l .yui-b #profile_details.box - %h3 Profile Photo + %h3="Profile Photo".l = @user.vendor ? "<div class='right_corner'><div class='community_pro'></div></div>" : '' = image_tag( @user.avatar_photo_url(:medium), :class => "polaroid" ) %label - Choose a photo for your profile: + ="Choose a photo for your profile:".l = file_field :avatar, :uploaded_data, :size => "20" %h3 Location = render :partial => 'shared/location_chooser', :locals => {:selected_country => @user.country_id, :selected_state => @user.state_id, :selected_metro_area => @user.metro_area_id, :states => @states, :metro_areas => @metro_areas} %label - ZIP/Postal code: + ="ZIP/Postal code:".l = text_field :user, :zip, :style=>"width:90px" - %h3 Birthday & Gender + %h3="Birthday & Gender".l %fieldset %legend - Gender + ="Gender".l %label = radio_button :user, :gender, User::MALE - Male + ="Male".l %label = radio_button :user, :gender, User::FEMALE - Female + ="Female".l %label - Birthday: + ="Birthday:".l = date_select :user, :birthday, {:start_year => 1926, :end_year => Time.now.year - 1} #yui-main .yui-b .box - %h3 About Me + %h3="About Me".l = text_area :user, :description, :class => "rich_text_editor", :style => "width:100%" .box.alt - Tips: + ="Tips:".l = render :partial => 'shared/bio_help' Feel free to embed images or videos ( %a{"href"=>"faq#images_and_flash", "target"=>"new"} How do I do that? @@ -61,17 +61,17 @@ %label %em - You could tag yourself + ="You could tag yourself".l - if @user.vendor? - "custom, friendly, local" + "custom, friendly, local".l - else = AppConfig.meta_keywords.split(",")[0..3].join(", ") %br - Tags are comma-separated keywords that describe you. + ="Tags are comma-separated keywords that describe you.".l %br - You can browse all content and users on + ="You can browse all content and users on".l = AppConfig.community_name - by looking at the + ="by looking at the".l = link_to "tags page", tags_path %p app/views/users/edit.html.haml @@ -4,10 +4,10 @@ #yui-main .yui-b.main_column .box - %h3 Forgot your passowrd? + %h3="Forgot your passowrd?".l - form_tag '/forgot_password', :class => 'MainForm' do - %label{"for"=>"email"} Enter your email address: + %label{"for"=>"email"}="Enter your email address:".l = text_field_tag 'login', nil, :size => 35 %p - = submit_tag 'Reset my password' \ No newline at end of file + = submit_tag 'Reset my password'.l \ No newline at end of file app/views/users/forgot_password.html.haml @@ -4,10 +4,10 @@ #yui-main .yui-b.main_column .box - %h3 Forgot your username? + %h3="Forgot your username?".l - form_tag '/forgot_username', :class => 'MainForm' do - %label{"for"=>"email"} Enter your email address: + %label{"for"=>"email"}="Enter your email address:".l = text_field_tag 'login', nil, :size => 35 %p - = submit_tag 'Send me my username' \ No newline at end of file + = submit_tag 'Send me my username'.l \ No newline at end of file app/views/users/forgot_username.html.haml @@ -6,7 +6,7 @@ #yui-main .yui-b .box.user_list - %h3= "#{AppConfig.community_name} Members" + %h3=:site_members.l :site => AppConfig.community_name .pagination= pagination_links_for @pages, {:link_to_current_page => true} if @pages.length > 1 app/views/users/index.html.haml @@ -4,7 +4,7 @@ .yui-b .box.alt.first_alt - %h3 Spread the word + %h3="Spread the word".l %p The more people you invite, the better = AppConfig.community_name @@ -17,7 +17,7 @@ #yui-main .yui-b .box - %h3 Invite Your Friends To Join! + %h3="Invite Your Friends To Join!".l - form_for(:invitation, :url => user_invitations_path(:user_id => @user.id ), :html => {:class => "MainForm"} ) do |f| .right %a{"href"=>"#", "onclick"=>"showPlaxoABChooser('invitation_email_addresses', '/application/plaxo'); return false;"} app/views/users/invite.html.haml @@ -1,50 +1,46 @@ .yui-b .box %h3 - Why Sign up? + ="Why Sign up?".l %ul.list.checks %li Some reason to sign up %li Some reason to sign up .box.alt - %h3 Tips + %h3="Tips".l %p - After signing up, - %strong - you'll receive an e-mail confirmation message. + ="After signing up, you'll receive an e-mail confirmation message.".l %p - %strong - Click the activation link in the e-mail - to log in. - %p= link_to "Already have an account?", "/login" + ="Click the activation link in the e-mail to log in.".l + %p= link_to "Already have an account?".l, "/login" #yui-main .yui-b .box - %h3 Sign up! + %h3="Sign up!".l = error_messages_for :user - form_for :user, :url => users_path, :html => {:class => 'MainForm'} do |f| %label{"for"=>"login"} - Username - %em (Required: Your username must not contain numerals, spaces or special characters.) + ="Username".l + %em="(Required: Your username must not contain numerals, spaces or special characters.)".l = f.text_field :login %label{"for"=>"email"} - E-mail address - %em (Required: We will send a confirmation e-mail to the address you enter.) + ="E-mail address".l + %em="(Required: We will send a confirmation e-mail to the address you enter.)".l = f.text_field :email %label{"for"=>"birthdate"} - Birthday: - %em (Required: you must be at least 13 years old to sign up.) - = date_select :user, :birthday, {:start_year => 1926, :end_year => Time.now.year - 13} + ="Birthday:".l + %em="(Required: you must be at least 13 years old to sign up.)".l + = date_select :user, :birthday, {:start_year => 1926, :end_year => (Time.now.year - 13)} %label{"for"=>"password"} - Type your password: + ="Type your password:".l = f.password_field :password %label{"for"=>"password_confirmation"} - Re-type your password to confirm: + ="Re-type your password to confirm:".l = f.password_field :password_confirmation = hidden_field_tag :inviter_id, params[:inviter_id] = hidden_field_tag :inviter_code, params[:inviter_code] - %p= submit_tag 'Sign up' \ No newline at end of file + %p= submit_tag 'Sign up'.l \ No newline at end of file app/views/users/new.html.haml @@ -8,7 +8,7 @@ ? Hey, you're a = AppConfig.community_name Pro! You should - = link_to "update your profile", edit_user_path(@user) + = link_to "update your profile".l, edit_user_path(@user) \! Add your skills, contact info and Web site. @@ -19,12 +19,12 @@ - if @user.description #about_me.box %h3 - About Me + ="About Me".l %p= @user.description #friends.box.alt %h3 - My Friends + ="My Friends".l = link_to "(#{@friend_count})", accepted_user_friendships_path(@user) if @friend_count > 5 = link_to "&raquo; Invite a friend to #{AppConfig.community_name}", invite_user_path(@user) if @is_current_user %br @@ -35,11 +35,11 @@ =render :partial => "users/sidebar_user", :locals => {:user => user} -if @accepted_friendships.size > 4 %h6.all - =link_to 'See All', accepted_user_friendships_path(@user) + =link_to 'See All'.l, accepted_user_friendships_path(@user) - unless @users_comments.empty? #photo_comments.yui-g.box.alt - %h3 My recent comments + %h3="My recent comments".l - @users_comments.each do |comment| - commentable_url = comment.generate_commentable_url %dl.vcard @@ -57,7 +57,7 @@ - unless @photo_comments.empty? #photo_comments.yui-g.box.alt - %h3 Photo Comments + %h3="Photo Comments".l - @photo_comments.each do |comment| %dl.vcard %dt.photo @@ -72,34 +72,34 @@ .yui-b - if @photos.empty? and @recent_posts.empty? .box.alt.first_alt - %h3= "#{@user.login} doesn't have much here yet. Stay tuned." + %h3= :small_profile.l :user => @user.login - unless @photos.empty? #photos.box - %h3 Photos + %h3="Photos".l - @photos.each do |photo| = link_to image_tag( photo.public_filename(:thumb), :class => "polaroid"), user_photo_path(@user, photo) - %h6.all.right= link_to "View all my photos", user_photos_path(@user) - = "#{link_to("Add a photo", new_user_photo_path(@user))}" if @is_current_user + %h6.all.right= link_to "View all my photos".l, user_photos_path(@user) + = "#{link_to("Add a photo".l, new_user_photo_path(@user))}" if @is_current_user - unless @recent_posts.empty? #posts.box - %h3 Recent Blog Posts + %h3="Recent Blog Posts".l = render :partial => 'posts/post', :collection => @recent_posts - %h6.right.all= link_to "View my blog", user_posts_path(@user) + %h6.right.all= link_to "View my blog".l, user_posts_path(@user) - unless @clippings.empty? #clippings.box - %h3 Clippings + %h3="Clippings".l - @clippings.each do |clipping| %a{"href"=>"#{h user_clipping_url(@user, clipping)}"} %img.clipping.polaroid{"src"=>"#{h clipping.image_uri(:thumb)}", :width => '100', :height => '100'} - %h6.all.right= link_to "View all my clippings", user_clippings_path(@user) + %h6.all.right= link_to "View all my clippings".l, user_clippings_path(@user) #comments.box.hfeed.comments - %h3 Profile Comments - %h2 Add Your Comment! + %h3="Profile Comments".l + %h2="Add Your Comment!".l %p= render :partial => 'comments/comment_form', :locals => {:commentable => @user} %a#newest_comment = render :partial => 'comments/comment', :collection => @comments app/views/users/show.html.haml @@ -1,5 +1,5 @@ .box - %h3 Go check your e-mail! + %h3="Go check your e-mail!".l %ul.list.checks %li We just sent an e-mail to app/views/users/signup_completed.html.haml @@ -3,7 +3,7 @@ %label Month: = select_month(@month) = select_year(@month, :start_year => 1.years.ago.year, :end_year => 1.years.from_now.year) - %p= submit_tag "Go" + %p= submit_tag "Go".l - if current_user.admin? %p= link_to "&laquo; Back to all statistics", statistics_path @@ -18,7 +18,7 @@ %th = "#{category.name}:" = "#{posts.size} posts" - %th Comments + %th=Comments.l %th{"width"=>"7%"} Views %tbody - posts.each do |post| app/views/users/statistics.html.haml @@ -1,18 +1,18 @@ .yui-b .box.alt.first_alt %h3 - Get Started: Tell us about yourself + ="Get Started: Tell us about yourself".l = render :partial => 'shared/bio_help' %p - Remember, you can always change this later. + ="Remember, you can always change this later.".l %p - = link_to "&raquo; Skip this step", welcome_invite_user_path(@user) + = link_to "&raquo; "+ "Skip this step".l, welcome_invite_user_path(@user) %br - = link_to "&raquo; Go to your profile", user_path(@user) + = link_to "&raquo; " + "Go to your profile".l, user_path(@user) - if @user.avatar_photo_url .box.alt - %h3 Your profile photo: + %h3="Your profile photo:".l .centered = @user.vendor ? "<div class='right_corner'><div class='community_pro'></div></div>" : '' = image_tag( @user.avatar_photo_url(:medium), :class => "polaroid", :style=>"width:250px" ) @@ -20,29 +20,29 @@ #yui-main .yui-b.box - form_tag user_path(:welcome => 'invite'), :method => 'put', :multipart =>true, :class => "MainForm" do - %h3 About You + %h3="About You".l = text_area :user, :description, :rows => 30, :style => 'width:100%', :class => "rich_text_editor" - %h3 Gender + %h3="Gender".l %fieldset %label = radio_button :user, :gender, User::MALE - Male + ="Male".l %label = radio_button :user, :gender, User::FEMALE - Female + ="Female".l - if @user.vendor? %p= render :partial => 'offerings/chooser' - %h3 More about you + %h3="More about you".l .yui-g .yui-u.first .box.alt %h3 - Choose your location + ="Choose your location".l %br - Postal code: + ="Postal code:".l %br = text_field :user, :zip, :size => 10 %br @@ -56,13 +56,13 @@ = auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [',', ' '] } %br %small - Comma-separated keywords that describe you. + ="Comma-separated keywords that describe you.".l %br - You could tag yourself + ="You could tag yourself".l - if @user.vendor? - "custom, friendly, local" + ="custom, friendly, local".l - else = AppConfig.meta_keywords.split(",")[0..3].join(', ') - %p= submit_tag 'Save, and continue to step three' + %p= submit_tag 'Save, and continue to step three'.l app/views/users/welcome_about.html.haml @@ -1,24 +1,22 @@ .box %h3 - Get Started: Invite some friends! - = 'Invite some customers!' if @user.vendor? + ="Get Started: Invite some friends!".l + = 'Invite some customers!'.l if @user.vendor? %p - The more people you invite, the better - = AppConfig.community_name - becomes. - %p People who sign up using your invitation will automatically be added as your friends. + =:invite_message.l(:site=> AppConfig.community_name) + %p="People who sign up using your invitation will automatically be added as your friends.".l - form_for(:invitation, :url => user_invitations_path(:user_id => @user.id), :html => {:class => "MainForm"} ) do |f| %label{"for"=>"email_addresses"} - Enter e-mail addresses + ="Enter e-mail addresses".l %em (comma-separated) \: = f.text_area :email_addresses , :size => "83x5" - %label{"for"=>"message"} Write a message: + %label{"for"=>"message"}="Write a message:".l = f.text_area :message, :size => "83x5", :value => "#{AppConfig.community_name} is great, check it out, you'll love it! #{}" %p - = submit_tag "Send Invitations!" + = submit_tag "Send Invitations!".l %br/ - = link_to "&raquo; Skip this and go to your profile", user_path(@user) \ No newline at end of file + = link_to "&raquo; "+ "Skip this and go to your profile".l, user_path(@user) \ No newline at end of file app/views/users/welcome_invite.html.haml @@ -1,28 +1,26 @@ .yui-b .box.alt.first_alt - %h3 Get Started: Upload a profile photo + %h3="Get Started: Upload a profile photo".l %p - Your profile photo represents you on - = AppConfig.community_name - \. You can change it later. - = link_to "&raquo; Skip this step", welcome_about_user_path(@user) + =:photo_message.l :site=>AppConfig.community_name + = link_to "&raquo; " + "Skip this step".l, welcome_about_user_path(@user) %br/ - = link_to "&raquo; Go to your profile", user_path(@user) + = link_to "&raquo; " + "Go to your profile".l, user_path(@user) #yui-main .yui-b .box - form_tag( user_path(:welcome => 'about'), :method => 'put', :multipart =>true, :class => "MainForm") do - %h3 Profile Photo + %h3="Profile Photo".l %p.centered = image_tag( @user.avatar_photo_url(:medium), :class => "right" ) %label - Choose a photo to upload: + ="Choose a photo to upload:".l %em - if @user.vendor? - You may want to use your company logo, or a photo of one of your products. - Photos should be 300x300 pixels. + ="You may want to use your company logo, or a photo of one of your products. ".l + ="Photos should be 300x300 pixels.".l = file_field :avatar, :uploaded_data, :size => "20" %p - = submit_tag 'Upload, and continue to step two' + = submit_tag 'Upload, and continue to step two'.l app/views/users/welcome_photo.html.haml @@ -39,7 +39,10 @@ alt blue dark #94beff /* 14. USER LIST */ /*========================================================*/ - +span.localized { + font-style: italic; + color: red; +} /* =============================================== */ /* 1. UNIVERSAL THINGS */ /* =============================================== */ assets/stylesheets/screen.css @@ -7,6 +7,9 @@ meta_keywords: 'keywords for use in META tags' sections_enabled: ['photos', 'posts', 'clippings', 'contests', 'categories', 'events'] show_advertising: false closed_beta_mode: false +# Comment this out if you want to infer the locale +# off of the http headers +community_locale: "en-US" # The label you use for 'staff' writers (featured writer, staff, pro, etc.) featured_writer_label: 'Featured Writer' engine_config/application.yml @@ -8,4 +8,4 @@ CommunityEngine.check_for_pending_migrations if AppConfig.theme theme_view_path = "#{RAILS_ROOT}/themes/#{AppConfig.theme}/views" ActionController::Base.view_paths = ActionController::Base.view_paths.dup.unshift(theme_view_path) -end +end \ No newline at end of file engine_config/boot.rb @@ -87,6 +87,11 @@ class UsersControllerTest < Test::Unit::TestCase assert_response :success end + + def test_should_get_new + get :new + assert_response :success + end def test_should_allow_signup assert_difference User, :count do test/functional/users_controller_test.rb @@ -20,7 +20,10 @@ class CategoryTest < Test::Unit::TestCase end def test_should_display_new_post_text - assert_equal "Write a 'Questions' post", Category.get(:questions).display_new_post_text + c = Category.get(:questions) + c.new_post_text = "Ask a question" + c.save! + assert_equal "Ask a question", Category.get(:questions).display_new_post_text end test/unit/category_test.rb 47ef63d2311e12eb5c86cfd35bea93db3909b1e9 e88dc2e417020be9a0de0fed06b0652136f8e7e9 Bruno Bornsztein bruno@otis.local http://github.com/bborn/communityengine/commit/ada02ea4b4cbde3240941e245bb52bb40be7b0d7 ada02ea4b4cbde3240941e245bb52bb40be7b0d7 2008-07-22T12:48:45-07:00 2008-07-22T12:48:45-07:00 Merge branch 'localization' Conflicts: app/views/posts/new.html.haml 69813bb4b2c2845d81ffd79f6320179a519fe376 Bruno Bornsztein bruno@otis.local