Permalink
Browse files

upgrade to Ruby 1.9.2

  • Loading branch information...
1 parent 3b41d7d commit 79552bf4700b50c5aee434a5a97313224a3d2072 @daqing committed Oct 12, 2011
View
@@ -7,3 +7,4 @@ public/uploads/
index/
.DS_Store
.cache_*
+*.sh
View
2 .rvmrc
@@ -1 +1 @@
-rvm use 1.8.7
+rvm use 1.9.2
View
@@ -40,8 +40,9 @@ gem 'turn'
# put test-only gems in this group so their generators
# and rake tasks are available in development mode:
group :development, :test do
- gem 'ruby-debug'
+ gem 'ruby-debug19', :require => 'ruby-debug'
gem 'RedCloth'
gem 'annotate'
gem 'thin'
+ gem 'minitest'
end
View
@@ -1,7 +1,7 @@
GEM
remote: http://rubygems.org/
specs:
- RedCloth (4.2.7)
+ RedCloth (4.2.8)
abstract (1.0.0)
actionmailer (3.0.10)
actionpack (= 3.0.10)
@@ -29,51 +29,53 @@ GEM
activemodel (= 3.0.10)
activesupport (= 3.0.10)
activesupport (3.0.10)
- acts_as_list (0.1.3)
+ acts_as_list (0.1.4)
annotate (2.4.0)
ansi (1.3.0)
+ archive-tar-minitar (0.5.2)
arel (2.0.10)
authlogic (3.0.3)
activerecord (>= 3.0.7)
activerecord (>= 3.0.7)
breadcrumbs (0.1.6)
i18n
builder (2.1.2)
- cancan (1.6.5)
- capistrano (2.6.0)
+ cancan (1.6.7)
+ capistrano (2.9.0)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- carrierwave (0.5.4)
+ carrierwave (0.5.7)
activesupport (~> 3.0)
- columnize (0.3.3)
+ columnize (0.3.4)
daemons (1.1.4)
erubis (2.6.6)
abstract (>= 1.0.0)
eventmachine (0.12.10)
highline (1.6.2)
i18n (0.5.0)
- jquery-rails (1.0.12)
+ jquery-rails (1.0.14)
railties (~> 3.0)
thor (~> 0.14)
json (1.6.1)
kaminari (0.12.4)
rails (>= 3.0.0)
- linecache (0.46)
- rbx-require-relative (> 0.0.4)
+ linecache19 (0.5.12)
+ ruby_core_source (>= 0.1.4)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
+ minitest (2.6.1)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.1.4)
+ net-ssh (2.2.1)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
polyglot (0.3.2)
@@ -97,17 +99,21 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (0.9.2)
- rbx-require-relative (0.0.5)
rdoc (3.10)
json (~> 1.4)
redcarpet (1.17.2)
require_relative (1.0.2)
- ruby-debug (0.10.4)
- columnize (>= 0.1)
- ruby-debug-base (~> 0.10.4.0)
- ruby-debug-base (0.10.4)
- linecache (>= 0.3)
- sqlite3 (1.3.3)
+ ruby-debug-base19 (0.11.25)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby_core_source (>= 0.1.4)
+ ruby-debug19 (0.11.6)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby-debug-base19 (>= 0.11.19)
+ ruby_core_source (0.1.5)
+ archive-tar-minitar (>= 0.5.2)
+ sqlite3 (1.3.4)
thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -116,10 +122,10 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- turn (0.8.2)
- ansi (>= 1.2.2)
+ turn (0.8.3)
+ ansi
tzinfo (0.3.30)
- workflow (0.8.0)
+ workflow (0.8.1)
PLATFORMS
ruby
@@ -136,10 +142,11 @@ DEPENDENCIES
carrierwave
jquery-rails (>= 0.2.6)
kaminari
+ minitest
rails (= 3.0.10)
redcarpet
require_relative
- ruby-debug
+ ruby-debug19
sqlite3
thin
turn
@@ -22,8 +22,7 @@ def destroy
@user_session.destroy
respond_to do |format|
- format.html { redirect_to root_path, :notice => "您已经成功退出。" }
-
+ format.html { redirect_to root_path, :notice => success_do(:logout) }
format.xml { head :ok }
end
end
@@ -44,7 +44,7 @@ def must_be_logged_in
def must_login_first
if not current_user
store_location
- flash[:notice] = "请先登录再继续操作"
+ flash[:notice] = t(:must_login_first)
redirect_to root_path
end
end
View
@@ -88,7 +88,7 @@ def current_state_name
end
def default_content
- "记录在Todo里。"
+ I18n.t('issue.default_content')
end
class << self
View
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
# == Schema Information
# Schema version: 20110503080934
#
@@ -3,7 +3,7 @@
<p><strong>Copyright &copy; <%= Time.now.year %> Project BluMine</strong></p>
<p>
<%= link_to t(:get_source_code), 'http://github.com/daqing/blumine/' %> | <%= link_to t(:blog), 'http://blog.xdaqing.com' %> |
- <% User::AVAILABLE_LANGUAGES.keys.each do |key| %>
+ <% [:zh, :en].each do |key| %>
<% if I18n.locale == key %>
<span class="current"><%= User::AVAILABLE_LANGUAGES[key] %></span>
<% else %>
View
@@ -90,6 +90,7 @@ en:
user_is_working_on: " is working on "
user_is_working_on_the_following: " is working on the following issues:"
issues_assigned_to: "Issues Assigned to %{username}"
+ default_content: see TODOs
label:
task: Task
bug: Bug
@@ -176,6 +177,7 @@ en:
access_denied: Access Denied
cancel_planning: Cancel Planning
+ must_login_first: Please login first to continue the operation
project:
ideas: Ideas
tasks: Tasks
View
@@ -91,6 +91,7 @@ zh:
user_is_working_on: 正在处理
user_is_working_on_the_following: "正在处理下列任务:"
issues_assigned_to: 分配给%{username}的任务
+ default_content: "记录在Todo里。"
label:
task: 任务
bug: 错误
@@ -184,6 +185,7 @@ zh:
destroy_failed: 删除失败
cancel_planning: 取消
+ must_login_first: "请先登录再继续操作"
project:
ideas: 想法
@@ -21,7 +21,7 @@ class UserFlowsTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
- assert_equal "您已经成功退出。", flash[:notice]
+ assert flash[:notice]
auth_as_foobar
assert_response :redirect

0 comments on commit 79552bf

Please sign in to comment.