Skip to content
Browse files

Cleanup trailing whitespace

  • Loading branch information...
1 parent e20e77f commit a39062c2a94906f4409c66802e075e9f3403a062 @sferik sferik committed
Showing with 215 additions and 215 deletions.
  1. +3 −3 app/controllers/application_controller.rb
  2. +3 −3 app/controllers/destinations_controller.rb
  3. +29 −29 app/controllers/groups_controller.rb
  4. +3 −3 app/controllers/registrations_controller.rb
  5. +5 −5 app/controllers/students_controller.rb
  6. +2 −2 app/controllers/users_controller.rb
  7. +1 −1 app/helpers/application_helper.rb
  8. +1 −1 app/mailers/notification_mailer.rb
  9. +1 −1 app/models/answer.rb
  10. +2 −2 app/models/checkin.rb
  11. +9 −9 app/models/destination.rb
  12. +1 −1 app/models/group.rb
  13. +4 −4 app/models/logged_message.rb
  14. +3 −3 app/models/question.rb
  15. +4 −4 app/models/student.rb
  16. +1 −1 app/stylesheets/partials/_base.scss
  17. +1 −1 app/stylesheets/partials/_colors.scss
  18. +1 −1 app/stylesheets/partials/_fonts.scss
  19. +1 −1 app/views/admins/_top_bar.html.erb
  20. +2 −2 app/views/destinations/_form.html.erb
  21. +1 −1 app/views/destinations/edit.html.erb
  22. +1 −1 app/views/destinations/responses.html.erb
  23. +1 −1 app/views/destinations/show.html.erb
  24. +1 −1 app/views/devise/confirmations/new.html.erb
  25. +4 −4 app/views/devise/confirmations/show.html.erb
  26. +1 −1 app/views/devise/passwords/edit.html.erb
  27. +1 −1 app/views/devise/passwords/new.html.erb
  28. +1 −1 app/views/devise/sessions/new.html.erb
  29. +1 −1 app/views/devise/shared/_links.erb
  30. +1 −1 app/views/devise/unlocks/new.html.erb
  31. +1 −1 app/views/groups/_ajax_membership_form.html.erb
  32. +1 −1 app/views/groups/_form.html.erb
  33. +1 −1 app/views/groups/_group_list.html.erb
  34. +4 −4 app/views/groups/_member_list.html.erb
  35. +2 −2 app/views/groups/_membership_form.html.erb
  36. +1 −1 app/views/groups/_message.html.erb
  37. +1 −1 app/views/groups/_nav.html.erb
  38. +1 −1 app/views/groups/_send_message.html.erb
  39. +1 −1 app/views/groups/_sidebar.html.erb
  40. +1 −1 app/views/groups/edit.html.erb
  41. +1 −1 app/views/groups/index.html.erb
  42. +1 −1 app/views/groups/members.html.erb
  43. +1 −1 app/views/groups/show.html.erb
  44. +1 −1 app/views/groups/update.js.erb
  45. +1 −1 app/views/layouts/_default_top_bar.html.erb
  46. +16 −16 app/views/layouts/application.html.erb
  47. +1 −1 app/views/registrations/edit_password.html.erb
  48. +7 −7 app/views/registrations/new.html.erb
  49. +1 −1 app/views/students/_form.html.erb
  50. +1 −1 app/views/students/new.html.erb
  51. +1 −1 app/views/students/show.html.erb
  52. +1 −1 app/views/students/update.js.erb
  53. +1 −1 app/views/users/_form.html.erb
  54. +1 −1 app/views/users/_top_bar.html.erb
  55. +1 −1 app/views/users/_user_list.html.erb
  56. +1 −1 app/views/users/edit.html.erb
  57. +1 −1 app/views/users/index.html.erb
  58. +1 −1 app/views/users/new.html.erb
  59. +1 −1 app/views/users/show.html.erb
  60. +1 −1 app/views/users/splash.html.erb
  61. +1 −1 config/application.rb
  62. +1 −1 config/compass.rb
  63. +1 −1 config/environment.rb
  64. +3 −3 config/environments/production.rb
  65. +1 −1 config/environments/test.rb
  66. +5 −5 config/initializers/compass.rb
  67. +2 −2 config/initializers/phone_validator.rb
  68. +1 −1 config/initializers/resque.rb
  69. +5 −5 config/locales/devise.fr.yml
  70. +1 −1 config/locales/devise.pt-BR.yml
  71. +2 −2 config/locales/rails_admin.bg.yml
  72. +2 −2 config/locales/rails_admin.da.yml
  73. +2 −2 config/locales/rails_admin.de.yml
  74. +2 −2 config/locales/rails_admin.es.yml
  75. +2 −2 config/locales/rails_admin.fi.yml
  76. +2 −2 config/locales/rails_admin.fr.yml
  77. +2 −2 config/locales/rails_admin.lt.yml
  78. +2 −2 config/locales/rails_admin.lv.yml
  79. +2 −2 config/locales/rails_admin.mn.yml
  80. +2 −2 config/locales/rails_admin.nl.yml
  81. +2 −2 config/locales/rails_admin.pl.yml
  82. +2 −2 config/locales/rails_admin.pt-BR.yml
  83. +2 −2 config/locales/rails_admin.pt-PT.yml
  84. +2 −2 config/locales/rails_admin.ru.yml
  85. +2 −2 config/locales/rails_admin.sv.yml
  86. +2 −2 config/locales/rails_admin.tr.yml
  87. +2 −2 config/locales/rails_admin.uk.yml
  88. +1 −1 config/locales/rails_admin.zh_cn.yml
  89. +1 −1 config/routes.rb
  90. BIN db/development.sqlite3.backup
  91. +3 −3 db/migrate/20110720040241_add_question_and_answers.rb
  92. +1 −1 db/migrate/20110720043316_add_checkin_to_student.rb
  93. +1 −1 db/seeds.rb
  94. +2 −2 doc/sign_in_process
  95. +2 −2 lib/google_translate.rb
  96. +1 −1 lib/phone_validator.rb
  97. +1 −1 lib/tasks/resque.rake
  98. +2 −2 test/fixtures/students.yml
View
6 app/controllers/application_controller.rb
@@ -1,7 +1,7 @@
class ApplicationController < ActionController::Base
protect_from_forgery
before_filter :ensure_domain if Rails.env.production?
-
+
def index
if user_signed_in?
redirect_to :groups
@@ -12,11 +12,11 @@ def index
end
#render welcome page by default
end
-
+
def ensure_domain
if request.env['HTTP_HOST'] != ENV["APP_DOMAIN"]
# HTTP 301 is a "permanent" redirect
redirect_to "http://#{ENV["APP_DOMAIN"]}", :status => 301
end
end
-end
+end
View
6 app/controllers/destinations_controller.rb
@@ -3,13 +3,13 @@
class DestinationsController < ApplicationController
before_filter :authenticate_user!
before_filter :load_group
-
+
# GET /destinations
# GET /destinations.xml
def index
@destinations = Destination.all
@groups = current_user.groups
-
+
respond_to do |format|
format.html # index.html.erb
format.xml { render :xml => @destinations }
@@ -125,7 +125,7 @@ def load_group
@group = Group.find(params[:destination][:group_id])
end
end
-
+
def render_csv(filename)
csv_data = CSV.generate {|csv| yield csv}
send_data csv_data, :type=> "text/csv", :filename=> filename, :disposition => "attachment"
View
58 app/controllers/groups_controller.rb
@@ -7,7 +7,7 @@ def index
else
@page_title = "Your Groups"
@groups = current_user.groups
- @group = @groups.first #TODO: remember what the user viewed the last time they were on the page
+ @group = @groups.first #TODO: remember what the user viewed the last time they were on the page
@messages = @group.logged_messages.unique_messages.order("created_at DESC")
end
@@ -27,7 +27,7 @@ def show
format.xml { render :xml => @group }
end
end
-
+
def members
@group = current_user.groups.find(params[:id])
@page_title = @group.title
@@ -38,13 +38,13 @@ def members
format.xml { render :xml => @members }
end
end
-
+
def new
@group = current_user.groups.new
@page_title = "New Group"
@students=[Student.new]*10
-
+
respond_to do |format|
format.html # new.html.erb
format.xml { render :xml => @group }
@@ -63,7 +63,7 @@ def create
@group.phone_number = get_new_phone_number
@group.destination_phone_number = get_new_phone_number
@page_title = "New Groups"
-
+
respond_to do |format|
if @group.save
format.html { redirect_to(group_path(@group), :notice => 'Group was successfully created.') }
@@ -88,7 +88,7 @@ def create
def update
@group = current_user.groups.find(params[:id])
@page_title = "#{@group.title}"
-
+
respond_to do |format|
if @group.update_attributes(params[:group])
@group.reload if @group.students.any?(&:marked_for_destruction?)
@@ -113,34 +113,34 @@ def destroy
format.xml { head :ok }
end
end
-
+
require 'csv'
def bulk_upload_students
@group = current_user.groups.find(params[:id])
-
+
if !@group
#404 or something?
#return
end
-
+
csv = CSV.parse(params[:upload][:csv].read)
-
+
#in future: these might be programatically defined, and possibly merge multiple cells.
retrieve_procs = {
:name => lambda {|row| row[0]},
:phone_number => lambda {|row| row[1]},
:email => lambda {|row| row[2]}
}
-
+
new_students=0
updated_students=0
-
+
csv.each do |row|
#hash.merge(self) accomplishes a .map, but keeps us a hash, not an array.
given = retrieve_procs.merge(retrieve_procs) {|key,value_proc| value_proc[row]}
#TODO: we should check if this is ambiguous, instead of giving priority to the first.
@student = @group.students.where("name = ? OR phone_number = ? OR email = ?",*given.values_at(:name,:phone_number,:email)).first
-
+
if @student
@student.update_attributes(given) #todo: check for errors
updated_students+=1
@@ -158,7 +158,7 @@ def send_message
@group = current_user.groups.find(params[:id])
message = @group.user.display_name+": "+params[:message][:content] #TODO: safety, parsing, whatever.
#TODO: ensure group found
-
+
if params[:commit].match /scheduled/i
time_zone = ActiveSupport::TimeZone["Eastern Time (US & Canada)"] #use eastern time for the input
scheduled_run = time_zone.local(*params[:date].values_at(*%w{year month day hour}).map(&:to_i))
@@ -196,13 +196,13 @@ def receive_message
render :text=>"sent", :status=>202
#needs to return something API-like, yo
end
-
+
#receive a POSTed email as a form from cloudmailin. figure out what to do with it.
def receive_email
-
+
from = params[:from]
body = params[:plain].gsub(/^On .* wrote:\r?$\s*(^>.*$\s*)+/,'') #strip out replies and whatnot
-
+
#if one of the to addresses matches us, use that one. todo - correctly handle mulitple emails, or correctly fail
if params[:to].match(/group\+(\d+)@/) && @group = Group.find($1)
@sender = @group.user.email==from ? @group.user : @group.students.find_by_email(from)
@@ -211,11 +211,11 @@ def receive_email
@sender = @group.user.email==from ? @group.user : @group.students.find_by_email(from)
handle_destination_message(@group,@sender,body)
end
-
-
+
+
render :text => 'success', :status => 200
end
-
+
def load_groups
@groups = current_user.groups.all
end
@@ -226,18 +226,18 @@ def get_new_phone_number
if r[:response].code == 200
return r[:response].parsed_response["href"].match(/\+1(\d{10})/)[1] rescue nil
end
-
+
return nil
end
def destroy_phone_number(num)
$outbound_flocky.destroy_phone_number_synchronous(num)
end
-
+
def handle_group_message(group,sender,message)
return unless [group,sender,message].all?(&:present?)
-
+
sent_by_admin = (sender == group.user)
-
+
case message
when /^\s*#remove[\s_]*me/
unless sent_by_admin
@@ -248,20 +248,20 @@ def handle_group_message(group,sender,message)
unless sent_by_admin
hashtag = $1
@destination = @group.destinations.find_by_hashtag(hashtag)
-
+
if @destination
@destination.checkin(sender)
else
@group.send_message("sorry, '#{hashtag}' doesn't seem to be a valid destination", nil, [sender])
end
-
+
end
else
message = (sent_by_admin ? group.user.display_name : sender.name)+": "+message
group.send_message(message,sender, sent_by_admin ? group.students : [group.user]) #if a student sent it, just send it to teacher. if teacher sent it, push to group
end
end
-
+
def handle_destination_message(group,sender,message)
return if (sender == group.user)
@@ -272,11 +272,11 @@ def handle_destination_message(group,sender,message)
@checkin = sender.active_checkin
@question = @checkin.current_question
sender.answers << Answer.new(:question=>@question, :content=>message)
-
+
@checkin.current_question_index += 1
@checkin.save
@checkin.destination.send_current_question(sender)
end
-
+
end
end
View
6 app/controllers/registrations_controller.rb
@@ -2,7 +2,7 @@ class RegistrationsController < Devise::RegistrationsController
prepend_before_filter :authenticate_scope!, :only=>[:edit,:update,:destroy,:edit_password, :dont_show_again]
def edit_password
end
-
+
def dont_show_again
current_user.update_attribute(:show_group_number_popup, false)
respond_to do |format|
@@ -10,9 +10,9 @@ def dont_show_again
format.js {"ok".to_json}
end
end
-
+
def after_inactive_sign_up_path_for(resource)
new_user_confirmation_path
end
-
+
end
View
10 app/controllers/students_controller.rb
@@ -1,6 +1,6 @@
class StudentsController < ApplicationController
before_filter :load_group
-
+
# GET /students
# GET /students.xml
def index
@@ -58,7 +58,7 @@ def create
end
end
end
-
+
def create_multiple
@page_title = "#{@group.title}"
@@ -73,7 +73,7 @@ def create_multiple
format.xml { render :xml => @group.errors, :status => :unprocessable_entity }
end
end
-
+
end
# PUT /students/1
@@ -105,7 +105,7 @@ def destroy
format.xml { head :ok }
end
end
-
+
private
def load_group
if params[:group_id]
@@ -114,4 +114,4 @@ def load_group
@group = Group.find(params[:student][:group_id])
end
end
-end
+end
View
4 app/controllers/users_controller.rb
@@ -59,11 +59,11 @@ def bulk_create
#expects a list of email addresses, either in text or in an uploaded file
#creates users for each address
email_text = params[:upload_file].present? ? params[:upload_file] : params[:emails]
-
+
successful_creates = email_text.split("\n").map do |email|
User.create(:email=>email)
end.count(true)
-
+
if successful_creates > 0
format.html { redirect_to(users_url, :notice => "#{successful_creates} users wer successfully created.") }
else
View
2 app/helpers/application_helper.rb
@@ -2,7 +2,7 @@ module ApplicationHelper
def formatted_date(date)
date.strftime('%m/%d/%Y') unless date.blank?
end
-
+
def formatted_time(time)
time.strftime('%m/%d/%Y %I:%M %p') unless time.blank?
end
View
2 app/mailers/notification_mailer.rb
@@ -1,6 +1,6 @@
class NotificationMailer < ActionMailer::Base
def notification_email(message,user,group)
- mail(:to=>user.email,
+ mail(:to=>user.email,
:from=>"group+#{group.id}@mail." + ENV["APP_DOMAIN"],
:subject=>"Update from #{group.title}") do |format|
format.text {render :text=>message}
View
2 app/models/answer.rb
@@ -2,4 +2,4 @@ class Answer < ActiveRecord::Base
belongs_to :question
belongs_to :student
validates_uniqueness_of :question_id, :scope=>:student_id
-end
+end
View
4 app/models/checkin.rb
@@ -2,8 +2,8 @@ class Checkin < ActiveRecord::Base
belongs_to :destination
belongs_to :student
validates_uniqueness_of :destination_id, :scope => :student_id
-
+
def current_question
destination.questions.all[current_question_index]
end
-end
+end
View
18 app/models/destination.rb
@@ -3,7 +3,7 @@ class Destination < ActiveRecord::Base
belongs_to :group
has_many :questions, :order => :order_index
has_many :checkins
-
+
accepts_nested_attributes_for :questions, :allow_destroy => true, :reject_if => :all_blank
def questions_attributes_with_reordering=(attributes_collection)
#this portion makes sure we have an array of attributes. it's taken from the original assign_nested_attributes_for_collection_association source
@@ -24,8 +24,8 @@ def questions_attributes_with_reordering=(attributes_collection)
att.merge(:order_index => (i+1))
end
puts "calling with: #{attributes_collection.inspect}"
-
- #for some weird reason,
+
+ #for some weird reason,
# questions_attributes_without_reordering=(attributes_collection)
#doesn't work. for now, I'll just assign directly. TODO: investigate more.
assign_nested_attributes_for_collection_association(:questions,attributes_collection)
@@ -41,18 +41,18 @@ def checkin(student)
c.current_question_index=0
c.complete=false
end
-
+
#send a welcome message
send_welcome_message(student, cn.new_record?)
-
+
cn.save if cn.new_record?
-
+
student.active_checkin = cn
student.save
-
+
send_current_question(student)
end
-
+
def send_current_question(student)
cn = student.active_checkin
return nil unless cn.destination == self
@@ -66,7 +66,7 @@ def send_current_question(student)
end
cn.save
end
-
+
def send_welcome_message(student, new_checkin=true)
if new_checkin
self.group.send_destination_message("OK, you're about to answer #{self.questions.count} #{self.name} questions. You can always continue later by texting ##{self.hashtag} to this number again. Now, get ready!", student)
View
2 app/models/group.rb
@@ -41,7 +41,7 @@ def send_destination_message(message,recipient)
LoggedMessage.create(:group=>self,:sender=>nil,:source_phone=>destination_phone_number,:destination_phone=>recipient.phone_number,:message=>message)
$outbound_flocky.message destination_phone_number, message, [recipient.phone_number]
end
-
+
if recipient.email.present?
#destination email send.
end
View
8 app/models/logged_message.rb
@@ -1,14 +1,14 @@
class LoggedMessage < ActiveRecord::Base
belongs_to :group
belongs_to :sender, :polymorphic=>true
-
+
validates_phone_number :source_phone, :allow_blank=>true #can be sent from website
validates_phone_number :destination_phone
-
+
validates_presence_of :message
-
+
attr_readonly :source_phone, :destination_phone, :message #can't edit after the fact
-
+
def self.unique_messages
select("max(created_at) as created_at, message, count(*) as recipient_count").group("message")
end
View
6 app/models/question.rb
@@ -1,9 +1,9 @@
class Question < ActiveRecord::Base
belongs_to :destination
has_many :answers
-
- #these validations get in conflict with our magic over in destination with questions_attributes.
+
+ #these validations get in conflict with our magic over in destination with questions_attributes.
#plus, if that's managing it, we don't have to worry about it here.
#validates_uniqueness_of :order_index, :scope => :destination_id
#validates_presence_of :order_index
-end
+end
View
8 app/models/student.rb
@@ -4,16 +4,16 @@ class Student < ActiveRecord::Base
has_many :answers
has_many :checkins
belongs_to :active_checkin, :class_name=>'Checkin'
-
+
#for the moment, we expect standard, US-style 10 digit area code/number. we assume a country code of 1.
validates_phone_number :phone_number, :allow_blank=>true
validates_uniqueness_of :phone_number, :scope=>:group_id, :allow_blank=>true, :allow_nil=>true
-
+
validates_presence_of :name
-
+
validate :notification_method_present?
-
+
def notification_method_present?
errors.add(:base,"either phone_number or email must be present") unless [phone_number,email].any?(&:present?)
end
View
2 app/stylesheets/partials/_base.scss
@@ -7,4 +7,4 @@ $blueprint-grid-margin: 10px;
// Use this to calculate the width based on the total width.
// Or you can set $blueprint-grid-width to a fixed value and unset $blueprint-container-size -- it will be calculated for you.
-$blueprint-grid-width: ($blueprint-container-size + $blueprint-grid-margin) / $blueprint-grid-columns - $blueprint-grid-margin;
+$blueprint-grid-width: ($blueprint-container-size + $blueprint-grid-margin) / $blueprint-grid-columns - $blueprint-grid-margin;
View
2 app/stylesheets/partials/_colors.scss
@@ -4,4 +4,4 @@ $notice-yellow : #f8bf06;
$notice : #6bb72c;
$notice-border : #529e13;
-$headline-gray : #444444;
+$headline-gray : #444444;
View
2 app/stylesheets/partials/_fonts.scss
@@ -5,4 +5,4 @@ body.two-col{
}
h1{ font-size: 3em; font-weight: bold; color: $headline-gray; margin-bottom: 14px; }
h2{ font-size: 1.75em; font-weight: bold; color: $headline-gray; margin-bottom: 14px; }
-h3{ font-size: 1.5em; font-weight: bold; color: $headline-gray; }
+h3{ font-size: 1.5em; font-weight: bold; color: $headline-gray; }
View
2 app/views/admins/_top_bar.html.erb
@@ -1 +1 @@
-<li><%= link_to "Sign out", destroy_admin_session_path %></li>
+<li><%= link_to "Sign out", destroy_admin_session_path %></li>
View
4 app/views/destinations/_form.html.erb
@@ -29,7 +29,7 @@
<%= f.text_area :notes, :class => "main" %>
<span class="field_description">Any relevant information you wish to include about this check-in (e.g. instructions, hints, due date, grading, etc.)</span>
</div>
-
+
<div id="questions_form">
<%= f.fields_for :questions do |qf| %>
<div class="field question">
@@ -40,7 +40,7 @@
<% end %>
</div>
<%= f.link_to_add "Add Question", :questions, :class => "button minor left margin_top" %>
-
+
<div class="actions right destination_actions">
<%= link_to 'Cancel', group_destinations_path(@group,@destination), :class => "button secondary" %>
<%= f.submit "Save", :class => "button" %>
View
2 app/views/destinations/edit.html.erb
@@ -11,4 +11,4 @@
<%= link_to 'Cancel', group_destination_path(@group,@destination), :class => "button secondary right" %>
</div>
-</div>
+</div>
View
2 app/views/destinations/responses.html.erb
@@ -25,4 +25,4 @@
</a>
<% end %>
</div>
-</div>
+</div>
View
2 app/views/destinations/show.html.erb
@@ -25,4 +25,4 @@
</div>
</div>
</div>
-</div>
+</div>
View
2 app/views/devise/confirmations/new.html.erb
@@ -14,4 +14,4 @@
<% end %>
<br>
<%= render :partial => "devise/shared/links" %>
-</div>
+</div>
View
8 app/views/devise/confirmations/show.html.erb
@@ -1,6 +1,6 @@
<h2>Activate Your Account</h2>
<% form_for @confirmable, :url => update_user_confirmation_path, :html => {:method => 'put'}, :id => 'activation-form' do |f| %>
-
+
<% if @confirmable.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(@confirmable.errors.count, "error") %> prohibited this group from being saved:</h2>
@@ -12,7 +12,7 @@
</ul>
</div>
<% end %>
-
+
<fieldset>
<legend><%= @confirmable.email %></legend>
@@ -28,7 +28,7 @@
<%= f.label :phone_number %><br />
<%= f.text_field :phone_number %>
</div>
-
+
<div class="field">
<%= f.label :password,'Password' %><br />
<%= f.password_field :password %>
@@ -40,4 +40,4 @@
<%= hidden_field_tag :confirmation_token,@confirmation_token %>
<p><%= f.submit "Activate", :class => "button"%></p>
</fieldset>
-<% end %>
+<% end %>
View
2 app/views/devise/passwords/edit.html.erb
@@ -13,4 +13,4 @@
<p><%= f.submit "Change my password" %></p>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render :partial => "devise/shared/links" %>
View
2 app/views/devise/passwords/new.html.erb
@@ -9,4 +9,4 @@
<p><%= f.submit "Reset My Password" %></p>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render :partial => "devise/shared/links" %>
View
2 app/views/devise/sessions/new.html.erb
@@ -13,7 +13,7 @@
<%= f.check_box :remember_me, :class => "" %><%= f.label :remember_me, :class => "inline"%>
<% end -%>
<p><%= f.submit "Sign In", :class => "button" %></p>
-
+
<% end %>
<div id="signin_more_actions">
<%= render :partial => "devise/shared/links" %>
View
2 app/views/devise/shared/_links.erb
@@ -22,4 +22,4 @@
<%- resource_class.omniauth_providers.each do |provider| %>
<span class="session_link"><%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %></span>
<% end -%>
-<% end -%>
+<% end -%>
View
2 app/views/devise/unlocks/new.html.erb
@@ -9,4 +9,4 @@
<p><%= f.submit "Resend unlock instructions" %></p>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render :partial => "devise/shared/links" %>
View
2 app/views/groups/_ajax_membership_form.html.erb
@@ -6,4 +6,4 @@
<br>
<%= f.submit 'Save', :class=>"button minor"%>
<a href="#" id="edit_student_cancel" data="<%= student.id%>" class="button minor secondary">Cancel</a>
-<%end%>
+<%end%>
View
2 app/views/groups/_form.html.erb
@@ -24,4 +24,4 @@
<div class="actions">
<%= f.submit "Save", :class => "button" %>
</div>
-<% end %>
+<% end %>
View
2 app/views/groups/_group_list.html.erb
@@ -23,4 +23,4 @@
</a>
<% end %>
</div>
-<% end %>
+<% end %>
View
8 app/views/groups/_member_list.html.erb
@@ -23,7 +23,7 @@
</li>
<% end %>
<li>
-
+
<%= nested_form_for @group, :url => create_multiple_group_students_path(@group), :html => {:method => :post} do |f|%>
<% f.fields_for :students, [] do |sf| %>
<span class="formwrap members">
@@ -36,10 +36,10 @@
<%= f.link_to_add "New Member", :students, :class => 'button minor right', :id => "add_multiple_members" %>
<%= f.submit "Save All", :class => 'button minor', :id => "save_multiple_members" %>
<% end %>
-
+
</li>
</ul>
-
+
<br><br>
<%= form_for @group, :url=>bulk_upload_students_group_path(@group), :html=>{:method=>:post, :multipart=>true} do |f| %>
@@ -50,4 +50,4 @@
<div class="actions">
<%= f.submit "Upload CSV", :class => 'button minor left margin_top' %>
</div>
-<%end%>
+<%end%>
View
4 app/views/groups/_membership_form.html.erb
@@ -11,10 +11,10 @@
<%= sf.text_field :phone_number, :class => "membership_field" %>
</div>
<br />
-
+
<%end%>
<div class="actions">
<%= f.submit %>
</div>
-<%end%>
+<%end%>
View
2 app/views/groups/_message.html.erb
@@ -9,4 +9,4 @@
</div>
<div id="sent_messages">
<%= render :partial => 'sent_messages'%>
-</div>
+</div>
View
2 app/views/groups/_nav.html.erb
@@ -68,4 +68,4 @@
</div>
</div>
</div>
-<% end %>
+<% end %>
View
2 app/views/groups/_send_message.html.erb
@@ -52,4 +52,4 @@
</span>
</div>
<%end%>
-<%end%>
+<%end%>
View
2 app/views/groups/_sidebar.html.erb
@@ -6,4 +6,4 @@
<div class="field_description margin large"><%= @groups.count %> groups</div>
<%= link_to "Add New Group", new_group_path, :class => 'button' %>
</div>
-</div>
+</div>
View
2 app/views/groups/edit.html.erb
@@ -5,4 +5,4 @@
<%= render 'form' %>
<%= link_to 'Delete Group', @group, :confirm => 'Are you sure?', :method => :delete, :class => "right button destroy" %>
</div>
-</div>
+</div>
View
2 app/views/groups/index.html.erb
@@ -16,4 +16,4 @@
</div>
</div>
</div>
-<% end %>
+<% end %>
View
2 app/views/groups/members.html.erb
@@ -6,4 +6,4 @@
<%= render :partial => 'member_list'%>
</div>
</div>
-</div>
+</div>
View
2 app/views/groups/show.html.erb
@@ -6,4 +6,4 @@
<%= render :partial => 'message'%>
</div>
</div>
-</div>
+</div>
View
2 app/views/groups/update.js.erb
@@ -3,4 +3,4 @@ $("#group_name").replaceWith(" <a href='<%=group_url(@group)%>' class = 'white'
$("#group_info span.title").replaceWith("<span class='title text_highlight'><%= @group.reload.title %></span>");
$("#group_info span.left").replaceWith("<span class='left text_highlight'><%= @group.reload.description %></span>");
$("#edit_group").replaceWith('<%=escape_javascript(render :partial => "ajax_form" )%>');
-$("#group_info").show();
+$("#group_info").show();
View
2 app/views/layouts/_default_top_bar.html.erb
@@ -1 +1 @@
-<li id="sign_in"><%= link_to('SIGN IN', new_user_session_path)%></li>
+<li id="sign_in"><%= link_to('SIGN IN', new_user_session_path)%></li>
View
32 app/views/layouts/application.html.erb
@@ -1,13 +1,13 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
- "http://www.w3.org/TR/html4/strict.dtd">
-
-<html lang="en">
-<head>
- <title>ClassTalk</title>
+ "http://www.w3.org/TR/html4/strict.dtd">
+
+<html lang="en">
+<head>
+ <title>ClassTalk</title>
<%= stylesheet_link_tag 'reset.css' %>
- <link href='http://fonts.googleapis.com/css?family=Luckiest+Guy' rel='stylesheet' type='text/css'>
- <link href='http://fonts.googleapis.com/css?family=Oswald' rel='stylesheet' type='text/css'>
- <link href='http://fonts.googleapis.com/css?family=Josefin+Sans:regular,bold' rel='stylesheet' type='text/css'>
+ <link href='http://fonts.googleapis.com/css?family=Luckiest+Guy' rel='stylesheet' type='text/css'>
+ <link href='http://fonts.googleapis.com/css?family=Oswald' rel='stylesheet' type='text/css'>
+ <link href='http://fonts.googleapis.com/css?family=Josefin+Sans:regular,bold' rel='stylesheet' type='text/css'>
<%= stylesheet_link_tag 'application.css' %>
<%= javascript_include_tag :all %>
<%= csrf_meta_tag %>
@@ -25,7 +25,7 @@
})();
</script>
-</head>
+</head>
<body>
<script type="text/javascript" charset="utf-8">
var is_ssl = ("https:" == document.location.protocol);
@@ -36,7 +36,7 @@
<script type="text/javascript" charset="utf-8">
var feedback_widget_options = {};
- feedback_widget_options.display = "overlay";
+ feedback_widget_options.display = "overlay";
feedback_widget_options.company = "code_for_america";
feedback_widget_options.placement = "left";
feedback_widget_options.color = "#2ea390";
@@ -64,13 +64,13 @@
<% else %>
<%= render "layouts/default_top_bar" %>
<%end %>
- <li><a href="http://codeforamerica.org/?cfa_project=whatsassign-me" class="nav_links">ABOUT</a></li>
+ <li><a href="http://codeforamerica.org/?cfa_project=whatsassign-me" class="nav_links">ABOUT</a></li>
</h3>
</ul>
</div>
</div>
<%= render :partial => 'layouts/notices' %>
-
+
<% if (params[:action] == 'splash') %>
<div id="main" class="splash">
<% elsif (@groups.blank?) || ((params[:action] == 'new') && (params[:controller] == 'groups')) %>
@@ -93,13 +93,13 @@
</div>
<!-- begin olark code -->
-
+
<script type='text/javascript'>/*{literal}<![CDATA[*/window.olark||(function(i){var e=window,h=document,a=e.location.protocol=="https:"?"https:":"http:",g=i.name,b="load";(function(){e[g]=function(){(c.s=c.s||[]).push(arguments)};var c=e[g]._={},f=i.methods.length; while(f--){(function(j){e[g][j]=function(){e[g]("call",j,arguments)}})(i.methods[f])} c.l=i.loader;c.i=arguments.callee;c.f=setTimeout(function(){if(c.f){(new Image).src=a+"//"+c.l.replace(".js",".png")+"&"+escape(e.location.href)}c.f=null},20000);c.p={0:+new Date};c.P=function(j){c.p[j]=new Date-c.p[0]};function d(){c.P(b);e[g](b)}e.addEventListener?e.addEventListener(b,d,false):e.attachEvent("on"+b,d); (function(){function l(j){j="head";return["<",j,"></",j,"><",z,' onl'+'oad="var d=',B,";d.getElementsByTagName('head')[0].",y,"(d.",A,"('script')).",u,"='",a,"//",c.l,"'",'"',"></",z,">"].join("")}var z="body",s=h[z];if(!s){return setTimeout(arguments.callee,100)}c.P(1);var y="appendChild",A="createElement",u="src",r=h[A]("div"),G=r[y](h[A](g)),D=h[A]("iframe"),B="document",C="domain",q;r.style.display="none";s.insertBefore(r,s.firstChild).id=g;D.frameBorder="0";D.id=g+"-loader";if(/MSIE[ ]+6/.test(navigator.userAgent)){D.src="javascript:false"} D.allowTransparency="true";G[y](D);try{D.contentWindow[B].open()}catch(F){i[C]=h[C];q="javascript:var d="+B+".open();d.domain='"+h.domain+"';";D[u]=q+"void(0);"}try{var H=D.contentWindow[B];H.write(l());H.close()}catch(E){D[u]=q+'d.write("'+l().replace(/"/g,String.fromCharCode(92)+'"')+'");d.close();'}c.P(2)})()})()})({loader:(function(a){return "static.olark.com/jsclient/loader0.js?ts="+(a?a[1]:(+new Date))})(document.cookie.match(/olarkld=([0-9]+)/)),name:"olark",methods:["configure","extend","declare","identify"]});
/* custom configuration goes here (www.olark.com/documentation) */
olark.identify('2369-288-10-5401');/*]]>{/literal}*/
</script>
-
+
<!-- end olark code -->
-
+
</body>
-</html>
+</html>
View
2 app/views/registrations/edit_password.html.erb
@@ -20,4 +20,4 @@
<%= link_to "Cancel", :back, :class => "button secondary left" %>
<%= f.submit "Save", :class => "button primary right" %>
<% end %>
-</div>
+</div>
View
14 app/views/registrations/new.html.erb
@@ -2,14 +2,14 @@
Start talking
</h1>
<div id="signup_form_wrap">
-
+
<p class="title">ClassTalk helps teachers engage and communicate with their classes through SMS and email.</p>
<p class="leading">Sign up for a free account below, or <%= link_to "sign in here", new_session_path(resource_name) %>.</p>
-
+
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
-
+
<%= devise_error_messages! %>
-
+
<div class="field">
<%= f.label :first_name, "Name" %>
<%= f.text_field :first_name, :title => "First", :class => "double_field infield_form_label" %>
@@ -36,7 +36,7 @@
</div>
<p><%= f.submit "Go Talk »", :class => 'button right' %></p>
-
+
<% end %>
-
-</div>
+
+</div>
View
2 app/views/students/_form.html.erb
@@ -25,4 +25,4 @@
</div>
<% #TODO: groups/memberships%>
<%= link_to 'Cancel', group_path(@group), :class => "button secondary minor margin_top" %>
-<%= f.submit "Save", :class => 'button minor margin_top' %>
+<%= f.submit "Save", :class => 'button minor margin_top' %>
View
2 app/views/students/new.html.erb
@@ -5,4 +5,4 @@
<%= render :partial => 'form', :locals => {:f => f} %>
</div>
<% end %>
- </div>
+ </div>
View
2 app/views/students/show.html.erb
@@ -18,7 +18,7 @@
<%= destination.try(:name) || "unknown destination" %>
<ol>
<% answers.each do |a| %>
- <li><%= a.question.try(:content) || "unknown question" %>:
+ <li><%= a.question.try(:content) || "unknown question" %>:
<%= a.content %></li>
<%end%>
</ol>
View
2 app/views/students/update.js.erb
@@ -1,4 +1,4 @@
$("#edit_student_<%= @student.id %>").hide();
$("#student_info_<%= @student.id %>").replaceWith('<%=escape_javascript(render :partial => "groups/member_list" , :locals => {:student => @student, :group => @group, :member => @student} )%>');
$("#edit_student_<%= @student.id %>").replaceWith('<%=escape_javascript(render :partial => "groups/ajax_membership_form" , :locals => {:student => @student, :group => @group} )%>');
-$("#student_info_<%= @student.id %>").show();
+$("#student_info_<%= @student.id %>").show();
View
2 app/views/users/_form.html.erb
@@ -18,4 +18,4 @@
<div class="actions">
<%= f.submit %>
</div>
-<% end %>
+<% end %>
View
2 app/views/users/_top_bar.html.erb
@@ -1,3 +1,3 @@
<li><%= link_to "Sign out", destroy_user_session_path %></li>
<li><%= link_to "Profile", edit_profile_path %></li>
- <li><%= link_to "Groups", groups_path %></li>
+ <li><%= link_to "Groups", groups_path %></li>
View
2 app/views/users/_user_list.html.erb
@@ -13,4 +13,4 @@
<td><%= link_to 'Delete', user, :confirm => 'Are you sure?', :method => :delete %></td>
</tr>
<% end %>
-</table>
+</table>
View
2 app/views/users/edit.html.erb
@@ -3,4 +3,4 @@
<div class="user_links">
<%= link_to 'Show', @user %> |
<%= link_to 'Back', users_path %>
-</div>
+</div>
View
2 app/views/users/index.html.erb
@@ -5,4 +5,4 @@
<br />
<div class="user_links">
<%= link_to 'New User', new_user_path %>
-</div>
+</div>
View
2 app/views/users/new.html.erb
@@ -2,4 +2,4 @@
<%= render 'form' %>
<div class="user_links">
<%= link_to 'Back', users_path %>
-</div>
+</div>
View
2 app/views/users/show.html.erb
@@ -5,4 +5,4 @@
<%= link_to 'Edit', edit_user_path(@user) %> |
<%= link_to 'Back', users_path %>
</div>
-</div>
+</div>
View
2 app/views/users/splash.html.erb
@@ -6,4 +6,4 @@
<%= link_to "http://codeforamerica.org/?cfa_project=classtalk", {:class => "splash_sub_action", :target => "blank"} do %>
Learn more about ClassTalk<!-- <span class="arrow_learn_more">▶</span> -->
<% end %>
-</div>
+</div>
View
2 config/application.rb
@@ -38,7 +38,7 @@ class Application < Rails::Application
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password]
-
+
config.action_view.javascript_expansions[:defaults] = %w(jquery rails application)
end
end
View
2 config/compass.rb
@@ -8,4 +8,4 @@
# sass_dir = "app/stylesheets"
# environment = Compass::AppIntegration::Rails.env
# # To enable relative paths to assets via compass helper functions. Uncomment:
-# # relative_assets = true
+# # relative_assets = true
View
2 config/environment.rb
@@ -3,4 +3,4 @@
# Initialize the rails application
HomeworkNotifier::Application.initialize!
-#$outbound_flocky = Flocky.new ENV['FLOCKY_TOKEN'],ENV['FLOCKY_APPNUM'],{:username=>ENV['FLOCKY_USERNAME'],:password=>ENV['FLOCKY_PASSWORD']}, :queue => false
+#$outbound_flocky = Flocky.new ENV['FLOCKY_TOKEN'],ENV['FLOCKY_APPNUM'],{:username=>ENV['FLOCKY_USERNAME'],:password=>ENV['FLOCKY_PASSWORD']}, :queue => false
View
6 config/environments/production.rb
@@ -46,10 +46,10 @@
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
-
+
config.action_mailer.default_url_options = { :host => ENV["APP_DOMAIN"] }
-
+
config.time_zone = "Eastern Time (US & Canada)"
-
+
$outbound_flocky = Flocky.new ENV['FLOCKY_TOKEN'],ENV['FLOCKY_APPNUM'],{:username=>ENV['FLOCKY_USERNAME'],:password=>ENV['FLOCKY_PASSWORD']}, :queue => false
end
View
2 config/environments/test.rb
@@ -24,7 +24,7 @@
# The :test delivery method accumulates sent emails in the
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test
-
+
config.action_mailer.default_url_options = {:host=>"blah"}
# Use SQL instead of Active Record's schema dumper when creating the test database.
# This is necessary if your schema can't be completely dumped by the schema dumper,
View
10 config/initializers/compass.rb
@@ -1,14 +1,14 @@
# require 'compass'
# require 'compass/app_integration/rails'
# require 'fileutils'
-#
+#
# FileUtils.mkdir_p(Rails.root.join("tmp", "stylesheets"))
-#
+#
# Compass::AppIntegration::Rails.initialize!
-#
+#
# Rails.configuration.middleware.delete('Sass::Plugin::Rack')
# Rails.configuration.middleware.insert_before('Rack::Sendfile', 'Sass::Plugin::Rack')
-#
+#
# Rails.configuration.middleware.insert_before('Rack::Sendfile', 'Rack::Static',
# :urls => ['/stylesheets'],
-# :root => "#{Rails.root}/tmp")
+# :root => "#{Rails.root}/tmp")
View
4 config/initializers/phone_validator.rb
@@ -5,9 +5,9 @@ def self.validates_phone_number(name,opts={})
before_validation lambda {massage_my_number!(name)} unless used_opts.delete(:massage_number) == false
validates_format_of(name, used_opts)
end
-
+
def massage_my_number!(name)
self[name]=PhoneValidator::massage_number(self[name])
end
-end#of class eval
+end#of class eval
View
2 config/initializers/resque.rb
@@ -1,4 +1,4 @@
ENV["REDISTOGO_URL"] ||= "redis://localhost:6379/"
uri = URI.parse(ENV["REDISTOGO_URL"])
-Resque.redis = Redis.new(:host => uri.host, :port => uri.port, :password => uri.password)
+Resque.redis = Redis.new(:host => uri.host, :port => uri.port, :password => uri.password)
View
10 config/locales/devise.fr.yml
@@ -2,7 +2,7 @@
# I18n French translation for Devise (http://github.com/plataformatec/devise)
# I18n traduction française pour Devise
#
-# Mise à jour par Yabo-concept http://www.yabo-concept.ch pour refléter les dernières clés utilisées par devise
+# Mise à jour par Yabo-concept http://www.yabo-concept.ch pour refléter les dernières clés utilisées par devise
# dans la branche "translated-views"
# basé sur https://github.com/davidw/devise/blob/translated-views/config/locales/en.yml
# 15.3.2011
@@ -14,7 +14,7 @@ fr:
messages:
not_found: "n'a pas été trouvé(e)"
already_confirmed: "a déjà été confirmé(e)"
- not_locked: "n'était pas verrouillé(e)"
+ not_locked: "n'était pas verrouillé(e)"
not_saved:
one: "1 erreur a empéché ce %{resource} d'être sauvegardé:"
other: "%{count} erreurs ont empéché ce %{resource} d'être sauvegardé:"
@@ -33,7 +33,7 @@ fr:
invalid: "Courriel ou mot de passe incorrect."
invalid_token: "Jeton d'authentification incorrect."
timeout: "Votre session est expirée, veuillez vous reconnecter pour continuer."
- inactive: "Votre compte n'est pas encore activé."
+ inactive: "Votre compte n'est pas encore activé."
sessions:
signed_in: "Connecté."
signed_out: "Déconnecté."
@@ -44,7 +44,7 @@ fr:
change_my_password: "Changer mon mot de passe"
send_reset_password_instructions: "Envoyez moi les instructions de réinitialisation du mot de passe"
send_instructions: 'Vous allez recevoir contenant les instructions de réinitialisation de mot de passe dans quelques minutes'
- updated: 'Votre mot de passe a été édité avec succès, vous êtes maintenant connectés'
+ updated: 'Votre mot de passe a été édité avec succès, vous êtes maintenant connectés'
confirmations:
resend_instructions: 'Ré-envoyer les instructions de confirmation'
send_instructions: 'Vous allez recevoir contenant les instructions nécessaires à la confirmation de votre compte dans quelques minutes'
@@ -85,4 +85,4 @@ fr:
reset_password_instructions:
subject: "Instructions pour changer le mot de passe"
unlock_instructions:
- subject: "Instructions pour déverrouiller le compte"
+ subject: "Instructions pour déverrouiller le compte"
View
2 config/locales/devise.pt-BR.yml
@@ -36,4 +36,4 @@ pt-BR:
reset_password_instructions:
subject: 'Instruções de reinicialização de senha'
unlock_instructions:
- subject: 'Instruções de desbloqueio'
+ subject: 'Instruções de desbloqueio'
View
4 config/locales/rails_admin.bg.yml
@@ -57,7 +57,7 @@ bg:
display: "Display %{name}: %{type}"
options_for: "Options for %{name}"
empty_value_for_associated_objects: "<empty>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Encode to"
@@ -79,4 +79,4 @@ bg:
delete: "изтрий"
deleted: "изтрит"
export: "export"
- exported: "exported"
+ exported: "exported"
View
4 config/locales/rails_admin.da.yml
@@ -55,7 +55,7 @@ da:
display: "Display %{name}: %{type}"
options_for: "Options for %{name}"
empty_value_for_associated_objects: "<empty>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Encode to"
@@ -77,4 +77,4 @@ da:
delete: "slet"
deleted: "slettet"
export: "export"
- exported: "exported"
+ exported: "exported"
View
4 config/locales/rails_admin.de.yml
@@ -59,7 +59,7 @@ de:
display: "Display %{name}: %{type}"
options_for: "Options for %{name}"
empty_value_for_associated_objects: "<empty>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Encode to"
@@ -81,4 +81,4 @@ de:
delete: "löschen"
deleted: "gelöscht"
export: "export"
- exported: "exported"
+ exported: "exported"
View
4 config/locales/rails_admin.es.yml
@@ -56,7 +56,7 @@ es:
display: "Mostrar %{name}: %{type}"
options_for: "Opciones de %{name}"
empty_value_for_associated_objects: "<vacio>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' esta disponible
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Codificado a"
@@ -78,4 +78,4 @@ es:
delete: "borrar"
deleted: "borrado"
export: "exportar"
- exported: "exportado"
+ exported: "exportado"
View
4 config/locales/rails_admin.fi.yml
@@ -57,7 +57,7 @@ fi:
display: "Sisällytä %{name}: %{type}"
options_for: "Valinnat %{name} muodolle"
empty_value_for_associated_objects: "<tyhjä>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Koodaus"
@@ -79,4 +79,4 @@ fi:
delete: "poista"
deleted: "poistettu"
export: "vie"
- exported: "viety"
+ exported: "viety"
View
4 config/locales/rails_admin.fr.yml
@@ -56,7 +56,7 @@ fr:
display: "Afficher %{name} : %{type}"
options_for: "Options pour %{name}"
empty_value_for_associated_objects: "<vide>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Encoder en..."
@@ -78,4 +78,4 @@ fr:
delete: "suppression"
deleted: "supprimé(e)"
export: "export"
- exported: "exporté(e)"
+ exported: "exporté(e)"
View
4 config/locales/rails_admin.lt.yml
@@ -58,7 +58,7 @@ lt:
display: "Display %{name}: %{type}"
options_for: "Options for %{name}"
empty_value_for_associated_objects: "<empty>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Encode to"
@@ -80,4 +80,4 @@ lt:
delete: "pašalinti"
deleted: "pašalintas"
export: "export"
- exported: "exported"
+ exported: "exported"
View
4 config/locales/rails_admin.lv.yml
@@ -56,7 +56,7 @@ lv:
display: "Display %{name}: %{type}"
options_for: "Options for %{name}"
empty_value_for_associated_objects: "<empty>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Encode to"
@@ -78,4 +78,4 @@ lv:
delete: "dzēst"
deleted: "dzēsts"
export: "export"
- exported: "exported"
+ exported: "exported"
View
4 config/locales/rails_admin.mn.yml
@@ -59,7 +59,7 @@ mn:
display: "Display %{name}: %{type}"
options_for: "Options for %{name}"
empty_value_for_associated_objects: "<empty>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Encode to"
@@ -81,4 +81,4 @@ mn:
delete: "устгах"
deleted: "устгасан"
export: "export"
- exported: "exported"
+ exported: "exported"
View
4 config/locales/rails_admin.nl.yml
@@ -2,7 +2,7 @@
# Translated from the English locale by Luuk Hendriks (DRiKE on github), used the date and datetime
# from https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/nl.yml
# credits for those sections to Ariejan de Vroom and Floris Huetink
-
+
nl:
home:
name: "home"
@@ -97,7 +97,7 @@ nl:
other: "meer dan %{count} jaar"
almost_x_years:
one: "bijna \xC3\xA9\xC3\xA9n jaar"
- other: "bijna %{count} jaar"
+ other: "bijna %{count} jaar"
date:
formats:
default: "%d/%m/%Y"
View
4 config/locales/rails_admin.pl.yml
@@ -59,7 +59,7 @@ pl:
display: "Display %{name}: %{type}"
options_for: "Options for %{name}"
empty_value_for_associated_objects: "<empty>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Encode to"
@@ -81,4 +81,4 @@ pl:
delete: "usuń"
deleted: "usunięty"
export: "export"
- exported: "exported"
+ exported: "exported"
View
4 config/locales/rails_admin.pt-BR.yml
@@ -59,7 +59,7 @@ pt-BR:
display: "Mostrar %{name}: %{type}"
options_for: "Opções para %{name}"
empty_value_for_associated_objects: "<empty>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Codificar para"
@@ -81,4 +81,4 @@ pt-BR:
delete: "excluir"
deleted: "excluído"
export: "exportar"
- exported: "exportado"
+ exported: "exportado"
View
4 config/locales/rails_admin.pt-PT.yml
@@ -58,7 +58,7 @@ pt-PT:
display: "Display %{name}: %{type}"
options_for: "Options for %{name}"
empty_value_for_associated_objects: "<empty>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Encode to"
@@ -80,4 +80,4 @@ pt-PT:
delete: "remover"
deleted: "removido"
export: "export"
- exported: "exported"
+ exported: "exported"
View
4 config/locales/rails_admin.ru.yml
@@ -58,7 +58,7 @@ ru:
display: "Показать %{name}: %{type}"
options_for: "Настройки для %{name}"
empty_value_for_associated_objects: "<пусто>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Декодировать как"
@@ -80,4 +80,4 @@ ru:
delete: "удалить"
deleted: "удален"
export: "экспортировать"
- exported: "экспортировано"
+ exported: "экспортировано"
View
4 config/locales/rails_admin.sv.yml
@@ -59,7 +59,7 @@ sv:
display: "Display %{name}: %{type}"
options_for: "Options for %{name}"
empty_value_for_associated_objects: "<empty>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Encode to"
@@ -81,4 +81,4 @@ sv:
delete: "ta bort"
deleted: "borttagen"
export: "export"
- exported: "exported"
+ exported: "exported"
View
4 config/locales/rails_admin.tr.yml
@@ -59,7 +59,7 @@ tr:
display: "Display %{name}: %{type}"
options_for: "Options for %{name}"
empty_value_for_associated_objects: "<empty>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Encode to"
@@ -81,4 +81,4 @@ tr:
delete: "sil"
deleted: "silindi"
export: "export"
- exported: "exported"
+ exported: "exported"
View
4 config/locales/rails_admin.uk.yml
@@ -56,7 +56,7 @@ uk:
display: "Display %{name}: %{type}"
options_for: "Options for %{name}"
empty_value_for_associated_objects: "<empty>"
- csv:
+ csv:
header_for_root_methods: "%{name}" # 'model' is available
header_for_association_methods: "%{name} [%{association}]"
encoding_to: "Encode to"