Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/initializers/inflections.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Be sure to restart your server when you modify this file.

# Add new inflection rules using the following format
# Add new inflection rules using the following format
# (all these examples are active by default):
# ActiveSupport::Inflector.inflections do |inflect|
# inflect.plural /^(ox)$/i, '\1en'
Expand Down
14 changes: 7 additions & 7 deletions config/locales/action_view_ja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ja:
delimiter: ","
# Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
precision: 3

# Used in number_to_currency()
currency:
format:
Expand All @@ -20,28 +20,28 @@ ja:
separator: "."
delimiter: ","
precision: 2

# Used in number_to_percentage()
percentage:
format:
# These three are to override number.format and are optional
# separator:
# separator:
delimiter: ""
# precision:
# precision:

# Used in number_to_precision()
precision:
format:
# These three are to override number.format and are optional
# separator:
delimiter: ""
# precision:

# Used in number_to_human_size()
human:
format:
# These three are to override number.format and are optional
# separator:
# separator:
delimiter: ""
precision: 1

Expand Down
6 changes: 3 additions & 3 deletions config/locales/active_record_ja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ ja:
# attributes:
# login:
# blank: "This is a custom blank message for User login"
# Will define custom blank validation message for User model and
# Will define custom blank validation message for User model and
# custom blank validation message for login attribute of User model.
models:

# Translate model names. Used in Model.human_name().
#models:
# For example,
# user: "Dude"
# will translate User model name to "Dude"

# Translate model attribute names. Used in Model.human_attribute_name(attribute).
#attributes:
# For example,
Expand Down
6 changes: 3 additions & 3 deletions config/locales/active_support_ja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ ja:
default: "%Y/%m/%d"
short: "%y/%m/%d"
long: "%Y年%m月%d日%A"

day_names: [日曜日, 月曜日, 火曜日, 水曜日, 木曜日, 金曜日, 土曜日]
abbr_day_names: [日, 月, 火, 水, 木, 金, 土]

# Don't forget the nil at the beginning; there's no such thing as a 0th month
month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
Expand All @@ -24,7 +24,7 @@ ja:
long: "%Y年%m月%d日%A %H時%M分%S秒%Z"
am: "午前"
pm: "午後"

# Used in array.to_sentence.
support:
array:
Expand Down
2 changes: 1 addition & 1 deletion config/locales/ja.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Japanese translations for Ruby on Rails
# Japanese translations for Ruby on Rails
# by Akira Matsuda (ronnie@dio.jp)
# AR error messages are basically taken from Ruby-GetText-Package. Thanks to Masao Mutoh.

Expand Down
12 changes: 6 additions & 6 deletions features/support/env.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
require 'cucumber/rails/world'

# If you set this to true, each scenario will run in a database transaction.
# You can still turn off transactions on a per-scenario basis, simply tagging
# a feature or scenario with the @no-txn tag.
# You can still turn off transactions on a per-scenario basis, simply tagging
# a feature or scenario with the @no-txn tag.
#
# If you set this to false, transactions will be off for all scenarios,
# regardless of whether you use @no-txn or not.
#
# Beware that turning transactions off will leave data in your database
# after each scenario, which can lead to hard-to-debug failures in
# Beware that turning transactions off will leave data in your database
# after each scenario, which can lead to hard-to-debug failures in
# subsequent scenarios. If you do this, we recommend you create a Before
# block that will explicitly put your database in a known state.
Cucumber::Rails::World.use_transactional_fixtures = true

# If you set this to false, any error raised from within your app will bubble
# If you set this to false, any error raised from within your app will bubble
# up to your step definition and out to cucumber unless you catch it somewhere
# on the way. You can make Rails rescue errors and render error pages on a
# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
Expand All @@ -39,7 +39,7 @@
require 'cucumber/rails/rspec'

require 'webrat'
require 'webrat/core/matchers'
require 'webrat/core/matchers'
Webrat.configure do |config|
config.mode = :rails
config.open_error_files = false # Set to true if you want error pages to pop up in the browser
Expand Down
12 changes: 6 additions & 6 deletions features/support/version_check.rb
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
if Cucumber::VERSION != '0.4.2'
warning = <<-WARNING
(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)

(::) R O T T E N C U C U M B E R A L E R T (::)

Your #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} file was generated with Cucumber 0.4.2,
but you seem to be running Cucumber #{Cucumber::VERSION}. If you're running an older
version than #{Cucumber::VERSION}, just upgrade your gem. If you're running a newer
but you seem to be running Cucumber #{Cucumber::VERSION}. If you're running an older
version than #{Cucumber::VERSION}, just upgrade your gem. If you're running a newer
version than #{Cucumber::VERSION} you should:

1) Read http://wiki.github.com/aslakhellesoy/cucumber/upgrading

2) Regenerate your cucumber environment with the following command:

ruby script/generate cucumber

If you get prompted to replace a file, hit 'd' to see the difference.
When you're sure you have captured any personal edits, confirm that you
want to overwrite #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} by pressing 'y'. Then reapply any
personal changes that may have been overwritten.
personal changes that may have been overwritten.

This message will then self destruct.

(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
WARNING
warn(warning)
at_exit {warn(warning)}
Expand Down
6 changes: 3 additions & 3 deletions lib/hikidoc.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Copyright (c) 2005, Kazuhiko <kazuhiko@fdiary.net>
# Copyright (c) 2007 Minero Aoki
# All rights reserved.
#
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
Expand All @@ -15,7 +15,7 @@
# * Neither the name of the HikiDoc nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/cucumber.rake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated by
# This file was generated by
$LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib')

unless ARGV.any? {|a| a =~ /^gems/}
Expand Down
8 changes: 4 additions & 4 deletions lib/tasks/rspec.rake
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ namespace :spec do
ActiveRecord::Base.establish_connection(Rails.env)
base_dir = File.join(Rails.root, 'spec', 'fixtures')
fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir

require 'active_record/fixtures'
(ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file|
Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
Expand All @@ -125,7 +125,7 @@ namespace :spec do

namespace :server do
daemonized_server_pid = File.expand_path("#{RAILS_ROOT}/tmp/pids/spec_server.pid")

desc "start spec_server."
task :start do
if File.exist?(daemonized_server_pid)
Expand All @@ -143,14 +143,14 @@ namespace :spec do
$stderr.puts "No server running."
else
$stderr.puts "Shutting down spec_server ..."
system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) &&
system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) &&
File.delete(daemonized_server_pid)
end
end

desc "restart spec_server."
task :restart => [:stop, :start]

desc "check if spec server is running"
task :status do
if File.exist?(daemonized_server_pid)
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/accounts_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')

describe AccountsHelper do

#Delete this example and add some real ones or delete this file
it "should be included in the object returned by #helper" do
included_modules = (class << helper; self; end).send :included_modules
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')

describe Admin::LightningTalkSubmissionHelper do

#Delete this example and add some real ones or delete this file
it "should be included in the object returned by #helper" do
included_modules = (class << helper; self; end).send :included_modules
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/exchange_tickets_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')

describe ExchangeTicketsHelper do

#Delete this example and add some real ones or delete this file
it "should be included in the object returned by #helper" do
included_modules = (class << helper; self; end).send :included_modules
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/paypal_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')

describe PaypalHelper do

#Delete this example and add some real ones or delete this file
it "should be included in the object returned by #helper" do
included_modules = (class << helper; self; end).send :included_modules
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/registrations_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')

describe RegistrationsHelper do

#Delete this example and add some real ones or delete this file
it "should be included in the object returned by #helper" do
included_modules = (class << helper; self; end).send :included_modules
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/sessions_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')

describe SessionsHelper do

#Delete this example and add some real ones or delete this file
it "should be included in the object returned by #helper" do
included_modules = (class << helper; self; end).send :included_modules
Expand Down
4 changes: 2 additions & 2 deletions spec/helpers/talks_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')

describe TalksHelper do

#Delete this example and add some real ones or delete this file
it "is included in the helper object" do
included_modules = (class << helper; self; end).send :included_modules
included_modules.should include(TalksHelper)
end

end
10 changes: 5 additions & 5 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
require 'spork'

Spork.prefork do
# Loading more in this block will cause your specs to run faster. However,
# Loading more in this block will cause your specs to run faster. However,
# if you change any configuration or code from libraries loaded here, you'll
# need to restart spork for it take effect.

end

Spork.each_run do
# This code will be run each time you run your specs.

end

# --- Instructions ---
# - Sort through your spec_helper file. Place as much environment loading
# code that you don't normally modify during development in the
# - Sort through your spec_helper file. Place as much environment loading
# code that you don't normally modify during development in the
# Spork.prefork block.
# - Place the rest under Spork.each_run block
# - Any code that is left outside of the blocks will be ran during preforking
Expand Down
2 changes: 1 addition & 1 deletion spec/views/sessions/create.html.erb_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
before(:each) do
render 'sessions/create'
end

#Delete this example and add some real ones or delete this file
it "should tell you where to find the file" do
response.should have_tag('p', %r[Find me in app/views/sessions/create])
Expand Down
2 changes: 1 addition & 1 deletion spec/views/sessions/destroy.html.erb_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
before(:each) do
render 'sessions/destroy'
end

#Delete this example and add some real ones or delete this file
it "should tell you where to find the file" do
response.should have_tag('p', %r[Find me in app/views/sessions/destroy])
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/lightning_talk_submissions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ one:
email: MyText
title: MyText
abstract: MyText
has_ticket:
has_ticket:
note: MyText

two:
Expand All @@ -15,5 +15,5 @@ two:
email: MyText
title: MyText
abstract: MyText
has_ticket:
has_ticket:
note: MyText
2 changes: 1 addition & 1 deletion test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Test::Unit::TestCase
# don't care one way or the other, switching from MyISAM to InnoDB tables
# is recommended.
#
# The only drawback to using transactional fixtures is when you actually
# The only drawback to using transactional fixtures is when you actually
# need to test transactions. Since your test is bracketed by a transaction,
# any transactions started in your code will be automatically rolled back.
self.use_transactional_fixtures = true
Expand Down
6 changes: 3 additions & 3 deletions vendor/plugins/configatron_rails/README.textile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
h2. "ConfigatronRails":http://www.github.com/cmaggard/configatron-rails

ConfigatronRails is a plugin born out of a want for environment-specific
variables using a gem I've grown to appreciate:
variables using a gem I've grown to appreciate:
"configatron":http://github.com/markbates/configatron.

* "Installation":#INSTALL
Expand All @@ -17,7 +17,7 @@ h3. Installation / Upgrading

<pre><code>
> sudo gem install configatron

# Or toss this in your environment.rb (preferred method)
config.gem "configatron"
</code></pre>
Expand Down Expand Up @@ -48,7 +48,7 @@ _In config.yml_

test:
<<: *local

production:
site_address: http://www.thebestappev.er/
</code></pre>
Expand Down
Loading