Download as
Browse Code »

Commit d74380135d18eafc45e4f04b15dc07731564b41f

Authored by Daniel Alves
Committed by Diego Camarinha
1 parent b608a621
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Fixing english errors, blank spaces and strings in general. 

Signed off by: Renan Fichberg <rfichberg@gmail.com>

Signed off by: Alessandro Palmeira <alessandro.palmeira@gmail.com>
Signed off by: Daniel Alves <danpaulalves@gmail.com>
Signed off by: Daniel Bucher <daniel.bucher88@gmail.com>
Signed off by: Diego Araujo <diegoamc90@gmail.com>
Signed off by: Heitor Reis <marcheing@gmail.com>
Signed off by: Rafael Manzo <rr.manzo@gmail.com>
Signed off by: Renan Fichberg <rfichberg@gmail.com>
Showing 29 changed files with 51 additions and 58 deletions   Show diff stats
app/assets/javascripts/module/graphic.js.coffee
  Diff comments   View file @d743801
@@ -29,7 +29,7 @@ class Module.Graphic @@ -29,7 +29,7 @@ class Module.Graphic
29 data = { 29 data = {
30 labels : dates, 30 labels : dates,
31 datasets : [ 31 datasets : [
32 - { 32 + {
33 fillColor : "rgba(220,220,220,0.5)", 33 fillColor : "rgba(220,220,220,0.5)",
34 strokeColor : "rgba(220,220,220,1)", 34 strokeColor : "rgba(220,220,220,1)",
35 pointColor : "rgba(220,220,220,1)", 35 pointColor : "rgba(220,220,220,1)",
app/controllers/mezuro_configurations_controller.rb
  Diff comments   View file @d743801
@@ -75,7 +75,7 @@ class MezuroConfigurationsController &lt; ApplicationController @@ -75,7 +75,7 @@ class MezuroConfigurationsController &lt; ApplicationController
75 if @mezuro_configuration.save 75 if @mezuro_configuration.save
76 current_user.mezuro_configuration_ownerships.create mezuro_configuration_id: @mezuro_configuration.id 76 current_user.mezuro_configuration_ownerships.create mezuro_configuration_id: @mezuro_configuration.id
77 77
78 - format.html { redirect_to mezuro_configuration_path(@mezuro_configuration.id), notice: 'mezuro configuration was successfully created.' } 78 + format.html { redirect_to mezuro_configuration_path(@mezuro_configuration.id), notice: 'Configuration was successfully created.' }
79 format.json { render action: 'show', status: :created, location: @mezuro_configuration } 79 format.json { render action: 'show', status: :created, location: @mezuro_configuration }
80 else 80 else
81 format.html { render action: 'new' } 81 format.html { render action: 'new' }
app/controllers/mezuro_ranges_controller.rb
  Diff comments   View file @d743801
@@ -38,11 +38,11 @@ class MezuroRangesController &lt; ApplicationController @@ -38,11 +38,11 @@ class MezuroRangesController &lt; ApplicationController
38 @mezuro_range.metric_configuration_id = @metric_configuration_id 38 @mezuro_range.metric_configuration_id = @metric_configuration_id
39 if @mezuro_range.update(mezuro_range_params) 39 if @mezuro_range.update(mezuro_range_params)
40 format.html { redirect_to mezuro_configuration_metric_configuration_path( 40 format.html { redirect_to mezuro_configuration_metric_configuration_path(
41 - @mezuro_configuration_id, @metric_configuration_id), notice: 'The range was successfully edited.' } 41 + @mezuro_configuration_id, @metric_configuration_id), notice: 'Range was successfully edited.' }
42 format.json { head :no_content } 42 format.json { head :no_content }
43 else 43 else
44 failed_action(format, 'edit') 44 failed_action(format, 'edit')
45 - end 45 + end
46 end 46 end
47 end 47 end
48 48
@@ -56,7 +56,7 @@ class MezuroRangesController &lt; ApplicationController @@ -56,7 +56,7 @@ class MezuroRangesController &lt; ApplicationController
56 def create_and_redir(format) 56 def create_and_redir(format)
57 if @mezuro_range.save 57 if @mezuro_range.save
58 format.html { redirect_to mezuro_configuration_metric_configuration_path( 58 format.html { redirect_to mezuro_configuration_metric_configuration_path(
59 - @mezuro_configuration_id, @metric_configuration_id), notice: 'The range was successfully created.' } 59 + @mezuro_configuration_id, @metric_configuration_id), notice: 'Range was successfully created.' }
60 else 60 else
61 failed_action(format, 'new') 61 failed_action(format, 'new')
62 end 62 end
app/controllers/reading_groups_controller.rb
  Diff comments   View file @d743801
@@ -31,7 +31,7 @@ class ReadingGroupsController &lt; ApplicationController @@ -31,7 +31,7 @@ class ReadingGroupsController &lt; ApplicationController
31 31
32 # GET /reading_groups/1/edit 32 # GET /reading_groups/1/edit
33 # GET /reading_groups/1/edit.json 33 # GET /reading_groups/1/edit.json
34 - def edit; end 34 + def edit; end
35 35
36 def update 36 def update
37 if @reading_group.update(reading_group_params) 37 if @reading_group.update(reading_group_params)
@@ -53,7 +53,7 @@ class ReadingGroupsController &lt; ApplicationController @@ -53,7 +53,7 @@ class ReadingGroupsController &lt; ApplicationController
53 end 53 end
54 54
55 private 55 private
56 - 56 +
57 # Use callbacks to share common setup or constraints between actions. 57 # Use callbacks to share common setup or constraints between actions.
58 def set_reading_group 58 def set_reading_group
59 @reading_group = ReadingGroup.find(params[:id]) 59 @reading_group = ReadingGroup.find(params[:id])
app/controllers/repositories_controller.rb
  Diff comments   View file @d743801
@@ -127,5 +127,4 @@ private @@ -127,5 +127,4 @@ private
127 failed_action(format, 'new') 127 failed_action(format, 'new')
128 end 128 end
129 end 129 end
130 -  
131 end 130 end
app/helpers/metric_configurations_helper.rb
  Diff comments   View file @d743801
@@ -14,4 +14,3 @@ module MetricConfigurationsHelper @@ -14,4 +14,3 @@ module MetricConfigurationsHelper
14 end 14 end
15 end 15 end
16 end 16 end
17 -  
app/helpers/mezuro_ranges_helper.rb
  Diff comments   View file @d743801
1 module MezuroRangesHelper 1 module MezuroRangesHelper
2 -  
3 def readings_options(readings) 2 def readings_options(readings)
4 readings.map { |reading| [reading.label, reading.id] } 3 readings.map { |reading| [reading.label, reading.id] }
5 end 4 end
app/models/concerns/kalibro_record.rb
  Diff comments   View file @d743801
@@ -7,7 +7,7 @@ module KalibroRecord @@ -7,7 +7,7 @@ module KalibroRecord
7 delegate :url_helpers, to: 'Rails.application.routes' 7 delegate :url_helpers, to: 'Rails.application.routes'
8 8
9 def persisted? 9 def persisted?
10 - self.class.exists?(self.id) unless self.id.nil? 10 + self.class.exists?(self.id) unless self.id.nil?
11 end 11 end
12 12
13 def update(attributes = {}) 13 def update(attributes = {})
app/models/date_module_result.rb
  Diff comments   View file @d743801
@@ -4,5 +4,4 @@ class DateModuleResult &lt; KalibroGatekeeperClient::Entities::DateModuleResult @@ -4,5 +4,4 @@ class DateModuleResult &lt; KalibroGatekeeperClient::Entities::DateModuleResult
4 def module_result 4 def module_result
5 ModuleResult.new @module_result.to_hash 5 ModuleResult.new @module_result.to_hash
6 end 6 end
7 -  
8 end 7 end
9 \ No newline at end of file 8 \ No newline at end of file
app/models/module_result.rb
  Diff comments   View file @d743801
@@ -8,7 +8,7 @@ class ModuleResult &lt; KalibroGatekeeperClient::Entities::ModuleResult @@ -8,7 +8,7 @@ class ModuleResult &lt; KalibroGatekeeperClient::Entities::ModuleResult
8 def history 8 def history
9 self.class.history_of(@id).map { |date_module_result| DateModuleResult.new date_module_result.to_hash } 9 self.class.history_of(@id).map { |date_module_result| DateModuleResult.new date_module_result.to_hash }
10 end 10 end
11 - 11 +
12 def metric_history(name) 12 def metric_history(name)
13 grade_history = Hash.new 13 grade_history = Hash.new
14 14
app/models/reading.rb
  Diff comments   View file @d743801
1 class Reading < KalibroGatekeeperClient::Entities::Reading 1 class Reading < KalibroGatekeeperClient::Entities::Reading
2 include KalibroRecord 2 include KalibroRecord
3 - 3 +
4 attr_accessor :label, :grade, :color 4 attr_accessor :label, :grade, :color
5 5
6 validates :label, presence: true, kalibro_uniqueness: true 6 validates :label, presence: true, kalibro_uniqueness: true
7 validates :grade, presence: true, numericality: true 7 validates :grade, presence: true, numericality: true
8 validates :color, presence: true 8 validates :color, presence: true
9 -  
10 end 9 end
app/models/user.rb
  Diff comments   View file @d743801
@@ -9,16 +9,14 @@ class User &lt; ActiveRecord::Base @@ -9,16 +9,14 @@ class User &lt; ActiveRecord::Base
9 validates :email, uniqueness: true 9 validates :email, uniqueness: true
10 10
11 has_many :project_ownerships 11 has_many :project_ownerships
12 -  
13 has_many :reading_group_ownerships 12 has_many :reading_group_ownerships
14 -  
15 has_many :mezuro_configuration_ownerships 13 has_many :mezuro_configuration_ownerships
16 # Alert: when adding new parameters to this model, they should also be added to registrations_controller 14 # Alert: when adding new parameters to this model, they should also be added to registrations_controller
17 15
18 def projects 16 def projects
19 project_ownerships.map { |project_ownership| project_ownership.project } 17 project_ownerships.map { |project_ownership| project_ownership.project }
20 end 18 end
21 - 19 +
22 def reading_groups 20 def reading_groups
23 reading_group_ownerships.map { |reading_group_ownership| reading_group_ownership.reading_group } 21 reading_group_ownerships.map { |reading_group_ownership| reading_group_ownership.reading_group }
24 end 22 end
app/models/validators/beginning_uniqueness_validator.rb
  Diff comments   View file @d743801
@@ -2,7 +2,7 @@ class BeginningUniquenessValidator &lt; ActiveModel::EachValidator @@ -2,7 +2,7 @@ class BeginningUniquenessValidator &lt; ActiveModel::EachValidator
2 def validate_each(record, attribute, value) 2 def validate_each(record, attribute, value)
3 record.class.ranges_of(record.metric_configuration_id).each do |mezuro_range| 3 record.class.ranges_of(record.metric_configuration_id).each do |mezuro_range|
4 if mezuro_range.beginning == value && mezuro_range.id != record.id 4 if mezuro_range.beginning == value && mezuro_range.id != record.id
5 - record.errors[attribute] << "There's already a #{record.class} with #{attribute} #{value}! Please, choose another one." 5 + record.errors[attribute] << "There is already a #{record.class} with #{attribute} #{value}! Please, choose another one."
6 break 6 break
7 end 7 end
8 end 8 end
app/models/validators/code_uniqueness_validator.rb
  Diff comments   View file @d743801
@@ -2,7 +2,7 @@ class CodeUniquenessValidator &lt; ActiveModel::EachValidator @@ -2,7 +2,7 @@ class CodeUniquenessValidator &lt; ActiveModel::EachValidator
2 def validate_each(record, attribute, value) 2 def validate_each(record, attribute, value)
3 record.class.metric_configurations_of(record.configuration_id).each do |metric_configuration| 3 record.class.metric_configurations_of(record.configuration_id).each do |metric_configuration|
4 if metric_configuration.code == value && metric_configuration.id != record.id 4 if metric_configuration.code == value && metric_configuration.id != record.id
5 - record.errors[attribute] << "There's already a #{record.class} with #{attribute} #{value}! Please, choose another one." 5 + record.errors[attribute] << "There is already a #{record.class} with #{attribute} #{value}! Please, choose another one."
6 break 6 break
7 end 7 end
8 end 8 end
app/models/validators/greater_than_beginning_validator.rb
  Diff comments   View file @d743801
1 class GreaterThanBeginningValidator < ActiveModel::EachValidator 1 class GreaterThanBeginningValidator < ActiveModel::EachValidator
2 def validate_each(record, attribute, value) 2 def validate_each(record, attribute, value)
3 - if record.beginning.is_a?(String) || value.is_a?(String) #TOOO This will be useless when we start representing INF as ruby Infinity with the new Kalibro configuration application. 3 + if record.beginning.is_a?(String) || value.is_a?(String) #TODO This will be useless when we start representing INF as ruby Infinity with the new Kalibro configuration application.
4 if record.beginning=="INF" || value=="-INF" || record.beginning == value 4 if record.beginning=="INF" || value=="-INF" || record.beginning == value
5 add_error(record,attribute) 5 add_error(record,attribute)
6 end 6 end
@@ -12,7 +12,7 @@ class GreaterThanBeginningValidator &lt; ActiveModel::EachValidator @@ -12,7 +12,7 @@ class GreaterThanBeginningValidator &lt; ActiveModel::EachValidator
12 private 12 private
13 13
14 def add_error(record, attribute) 14 def add_error(record, attribute)
15 - record.errors[attribute] << "The end value should be greater than the beginning value." 15 + record.errors[attribute] << "The End value should be greater than the Beginning value."
16 end 16 end
17 17
18 end 18 end
app/models/validators/kalibro_uniqueness_validator.rb
  Diff comments   View file @d743801
@@ -2,7 +2,7 @@ class KalibroUniquenessValidator &lt; ActiveModel::EachValidator @@ -2,7 +2,7 @@ class KalibroUniquenessValidator &lt; ActiveModel::EachValidator
2 def validate_each(record, attribute, value) 2 def validate_each(record, attribute, value)
3 record.class.all.each do |entity| 3 record.class.all.each do |entity|
4 if (entity.send(attribute) == value) and (entity.id != record.id) 4 if (entity.send(attribute) == value) and (entity.id != record.id)
5 - record.errors[attribute] << "There's already a #{record.class} with #{attribute} #{value}! Please, choose another one." 5 + record.errors[attribute] << "There is already a #{record.class} with #{attribute} #{value}! Please, choose another one."
6 break 6 break
7 end 7 end
8 end 8 end
app/models/validators/range_overlapping_validator.rb
  Diff comments   View file @d743801
@@ -2,7 +2,7 @@ class RangeOverlappingValidator &lt; ActiveModel::Validator @@ -2,7 +2,7 @@ class RangeOverlappingValidator &lt; ActiveModel::Validator
2 def validate(record) 2 def validate(record)
3 record.class.ranges_of(record.metric_configuration_id).each do |mezuro_range| 3 record.class.ranges_of(record.metric_configuration_id).each do |mezuro_range|
4 if mezuro_range.id != record.id && overlaps?(mezuro_range,record) 4 if mezuro_range.id != record.id && overlaps?(mezuro_range,record)
5 - record.errors[:beginning] << "There's already a #{record.class} within these boundaries! Please, choose another ones." 5 + record.errors[:beginning] << "There is already a #{record.class} within these boundaries! Please, choose another interval."
6 break 6 break
7 end 7 end
8 end 8 end
app/views/compound_metric_configurations/_form.html.erb
  Diff comments   View file @d743801
@@ -13,10 +13,10 @@ @@ -13,10 +13,10 @@
13 </div> 13 </div>
14 <div class="help-container"> 14 <div class="help-container">
15 <p> 15 <p>
16 - Code it is a variable that holds the value of a metric analysis. It's used inside a compound metric 16 + Code is a variable that keeps the value of a metric analysis. It is used inside a compound metric.
17 </p> 17 </p>
18 <p> 18 <p>
19 - Example : 19 + Example:
20 Code foo := 10 20 Code foo := 10
21 </p> 21 </p>
22 </div> 22 </div>
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 </div> 29 </div>
30 <div class="help-container"> 30 <div class="help-container">
31 <p> 31 <p>
32 - It's the weight of the metric 32 + It is the weight of the metric.
33 </p> 33 </p>
34 </div> 34 </div>
35 </div> 35 </div>
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 </div> 44 </div>
45 <div class="help-container"> 45 <div class="help-container">
46 <p> 46 <p>
47 - The reading group that is associated with this metric 47 + The Reading Group associated with this metric.
48 </p> 48 </p>
49 </div> 49 </div>
50 </div> 50 </div>
app/views/compound_metric_configurations/_metric_options.html.erb
  Diff comments   View file @d743801
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 </div> 41 </div>
42 <div class="help-container"> 42 <div class="help-container">
43 <p> 43 <p>
44 - With which code type your metric is designed to work? 44 + The code type your metric is designed to work with.
45 </p> 45 </p>
46 </div> 46 </div>
47 </div> 47 </div>
app/views/compound_metric_configurations/show.html.erb
  Diff comments   View file @d743801
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <% if @compound_metric_configuration.metric.description.nil? %> 7 <% if @compound_metric_configuration.metric.description.nil? %>
8 <%= "There is no description available." %> 8 <%= "There is no description available." %>
9 <% else %> 9 <% else %>
10 - <%= @compound_metric_configuration.metric.description %> 10 + <%= @compound_metric_configuration.metric.description %>
11 <% end %> 11 <% end %>
12 </p> 12 </p>
13 13
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 45
46 <h2> Ranges </h2> 46 <h2> Ranges </h2>
47 <% if mezuro_configuration_owner? @compound_metric_configuration.configuration_id %> 47 <% if mezuro_configuration_owner? @compound_metric_configuration.configuration_id %>
48 - <%= link_to 'Add Range', mezuro_configuration_metric_configuration_new_mezuro_range_path(@compound_metric_configuration.configuration_id, 48 + <%= link_to 'Add Range', mezuro_configuration_metric_configuration_new_mezuro_range_path(@compound_metric_configuration.configuration_id,
49 @compound_metric_configuration.id), class: 'btn btn-info' %> 49 @compound_metric_configuration.id), class: 'btn btn-info' %>
50 <% end %> 50 <% end %>
51 51
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 <%= link_to 'Back', mezuro_configuration_path(@compound_metric_configuration.configuration_id), class: 'btn btn-default' %> 72 <%= link_to 'Back', mezuro_configuration_path(@compound_metric_configuration.configuration_id), class: 'btn btn-default' %>
73 <% if mezuro_configuration_owner? @compound_metric_configuration.configuration_id %> 73 <% if mezuro_configuration_owner? @compound_metric_configuration.configuration_id %>
74 <%= link_to 'Destroy Metric Configuration', mezuro_configuration_metric_configuration_path(@compound_metric_configuration.configuration_id, 74 <%= link_to 'Destroy Metric Configuration', mezuro_configuration_metric_configuration_path(@compound_metric_configuration.configuration_id,
75 - @compound_metric_configuration.id), method: :delete, data: { confirm: 'Are you sure that you want to destroy this metric configuration?' }, 75 + @compound_metric_configuration.id), method: :delete, data: { confirm: 'Are you sure that you want to destroy this Metric Configuration?' },
76 class: 'btn btn-danger' %> 76 class: 'btn btn-danger' %>
77 <% end %> 77 <% end %>
78 </p> 78 </p>
app/views/devise/mailer/reset_password_instructions.html.erb
  Diff comments   View file @d743801
1 <p>Hello <%= @resource.email %>!</p> 1 <p>Hello <%= @resource.email %>!</p>
2 2
3 -<p>Someone has requested a link to change your password. You can do this through the link below.</p> 3 +<p>Someone has requested a link to change your password. You can do this through the link below:</p>
4 4
5 <p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %></p> 5 <p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %></p>
6 6
7 -<p>If you didn't request this, please ignore this email.</p>  
8 -<p>Your password won't change until you access the link above and create a new one.</p> 7 +<p>If you did not request this, please ignore this email.</p>
  8 +<p>Your password will not change until you access the link above and create a new one.</p>
app/views/devise/passwords/new.html.erb
  Diff comments   View file @d743801
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 </div> 14 </div>
15 <div class="help-container"> 15 <div class="help-container">
16 <p> 16 <p>
17 - The same email address that you used on the sign up 17 + The same email address used to sign up.
18 </p> 18 </p>
19 </div> 19 </div>
20 </div> 20 </div>
app/views/devise/registrations/edit.html.erb
  Diff comments   View file @d743801
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 </div> 14 </div>
15 <div class="help-container"> 15 <div class="help-container">
16 <p> 16 <p>
17 - Your full name! 17 + Your full name.
18 </p> 18 </p>
19 </div> 19 </div>
20 </div> 20 </div>
@@ -30,19 +30,19 @@ @@ -30,19 +30,19 @@
30 </div> 30 </div>
31 <div class="help-container"> 31 <div class="help-container">
32 <p> 32 <p>
33 - Your email is the form of communication we have with you, so make sure you typed it correctly! 33 + Your email is our communication channel. Make sure you have typed it correctly.
34 </p> 34 </p>
35 </div> 35 </div>
36 </div> 36 </div>
37 37
38 <div class="form-row"> 38 <div class="form-row">
39 <div class="field-container"> 39 <div class="field-container">
40 - <%= f.label :password, class: 'control-label' %> <i>(leave blank if you don't want to change it)</i><br /> 40 + <%= f.label :password, class: 'control-label' %> <i>(leave it blank if you do not want to change it)</i><br />
41 <%= f.password_field :password, :autocomplete => "off", class: 'text-field' %> 41 <%= f.password_field :password, :autocomplete => "off", class: 'text-field' %>
42 </div> 42 </div>
43 <div class="help-container"> 43 <div class="help-container">
44 <p> 44 <p>
45 - Your password must be at least 8 characters. Strong passwords contain characters in upper and lowercase, numbers and symbols. 45 + Your password must have at least 8 characters. Strong passwords contain numbers, symbols, upper and lowercase characters.
46 </p> 46 </p>
47 </div> 47 </div>
48 </div> 48 </div>
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 </div> 54 </div>
55 <div class="help-container"> 55 <div class="help-container">
56 <p> 56 <p>
57 - Confirm your password! 57 + Confirm your password.
58 </p> 58 </p>
59 </div> 59 </div>
60 </div> 60 </div>
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 </div> 66 </div>
67 <div class="help-container"> 67 <div class="help-container">
68 <p> 68 <p>
69 - We need your current password to confirm your changes! 69 + Your current password is needed to confirm your changes.
70 </p> 70 </p>
71 </div> 71 </div>
72 </div> 72 </div>
@@ -82,4 +82,4 @@ @@ -82,4 +82,4 @@
82 82
83 <h2>Cancel my account</h2> 83 <h2>Cancel my account</h2>
84 84
85 -<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete, class: 'btn btn-danger' %></p> 85 +<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Do you really want to cancel your account?" }, :method => :delete, class: 'btn btn-danger' %></p>
app/views/devise/registrations/new.html.erb
  Diff comments   View file @d743801
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 </div> 14 </div>
15 <div class="help-container"> 15 <div class="help-container">
16 <p> 16 <p>
17 - Your full name! 17 + Your full name.
18 </p> 18 </p>
19 </div> 19 </div>
20 </div> 20 </div>
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 </div> 26 </div>
27 <div class="help-container"> 27 <div class="help-container">
28 <p> 28 <p>
29 - Your email is the form of communication we have with you, so make sure you typed it correctly! 29 + Your email is our communication channel. Make sure you have typed it correctly.
30 </p> 30 </p>
31 </div> 31 </div>
32 </div> 32 </div>
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 </div> 38 </div>
39 <div class="help-container"> 39 <div class="help-container">
40 <p> 40 <p>
41 - Your password must be at least 8 characters. Strong passwords contain characters in upper and lowercase, numbers and symbols. 41 + Your password must have at least 8 characters. Strong passwords contain numbers, symbols, upper and lowercase characters.
42 </p> 42 </p>
43 </div> 43 </div>
44 </div> 44 </div>
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 </div> 50 </div>
51 <div class="help-container"> 51 <div class="help-container">
52 <p> 52 <p>
53 - Confirm your password! 53 + Confirm your password.
54 </p> 54 </p>
55 </div> 55 </div>
56 </div> 56 </div>
@@ -58,6 +58,6 @@ @@ -58,6 +58,6 @@
58 </div> 58 </div>
59 59
60 <div class="row margin-left-none" style="margin-top: 20px"> 60 <div class="row margin-left-none" style="margin-top: 20px">
61 - <%= f.submit "Sign Up", class: 'btn btn-primary span2' %> 61 + <%= f.submit "Sign Up", class: 'btn btn-primary span2' %>
62 </div> 62 </div>
63 <% end %> 63 <% end %>
app/views/devise/sessions/new.html.erb
  Diff comments   View file @d743801
1 <div class="page-header"> 1 <div class="page-header">
2 - <h1>Log in to Mezuro</h1> 2 + <h1>Login into Mezuro</h1>
3 </div> 3 </div>
4 4
5 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name),:html => { :class => "form-inline" }) do |f| %> 5 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name),:html => { :class => "form-inline" }) do |f| %>
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 </div> 12 </div>
13 <div class="help-container"> 13 <div class="help-container">
14 <p> 14 <p>
15 - The same email address that you used on the sign up 15 + The same email address used to sign up.
16 </p> 16 </p>
17 </div> 17 </div>
18 </div> 18 </div>
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 </div> 28 </div>
29 <div class="help-container"> 29 <div class="help-container">
30 <p> 30 <p>
31 - If you <a href="/users/password/new">forgot your password</a> follow this link to reset it 31 + If you forgot your password, follow this <a href="/users/password/new">link</a> to reset it.
32 </p> 32 </p>
33 </div> 33 </div>
34 </div> 34 </div>
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 </div> 46 </div>
47 <div class="help-container"> 47 <div class="help-container">
48 <p> 48 <p>
49 - Stay logged in 49 + Stay logged in.
50 </p> 50 </p>
51 </div> 51 </div>
52 </div> 52 </div>
app/views/devise/shared/_links.erb
  Diff comments   View file @d743801
@@ -11,11 +11,11 @@ @@ -11,11 +11,11 @@
11 <% end -%> --> 11 <% end -%> -->
12 12
13 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> 13 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
14 - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: 'btn btn-info' %> 14 + <%= link_to "Have you received confirmation instructions?", new_confirmation_path(resource_name), class: 'btn btn-info' %>
15 <% end -%> 15 <% end -%>
16 16
17 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> 17 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
18 - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name), class: 'btn btn-info' %> 18 + <%= link_to "Have you received unlock instructions?", new_unlock_path(resource_name), class: 'btn btn-info' %>
19 <% end -%> 19 <% end -%>
20 20
21 <%- if devise_mapping.omniauthable? %> 21 <%- if devise_mapping.omniauthable? %>
app/views/home/index.html.erb
  Diff comments   View file @d743801
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 3
4 <p>This is Mezuro! A <strong>free/libre</strong> web platform for <strong>collaborative</strong> source code <strong>evaluation</strong>.</p> 4 <p>This is Mezuro! A <strong>free/libre</strong> web platform for <strong>collaborative</strong> source code <strong>evaluation</strong>.</p>
5 5
6 - <p>Here you can evaluate your source code with the most popular SCMs (Git SVN), just by providing it's URL. For now, you can evaluate <strong>C</strong>, <strong>C++</strong>, and <strong>Java</strong> source codes, but soon we hope to support more languages!</p> 6 + <p>Here you can evaluate your source code with the most popular SCMs (like Git and SVN), just by providing its URL. For now, you can evaluate <strong>C</strong>, <strong>C++</strong> and <strong>Java</strong> source codes, but we hope to support more languages in the future.</p>
7 7
8 - <p> Mezuro is under development. Try it and give us your <%= link_to 'feedback', 'https://github.com/mezuro/mezuro/issues', target: '_blank' %>.</p> 8 + <p> Mezuro is continuously under development. Try it and give us your <%= link_to 'feedback', 'https://github.com/mezuro/mezuro/issues', target: '_blank' %>.</p>
9 </div> 9 </div>
10 10
11 <h2>Latest projects</h2> 11 <h2>Latest projects</h2>
app/views/layouts/application.html.erb
  Diff comments   View file @d743801
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 </div><!--/.well --> 97 </div><!--/.well -->
98 </div><!--/span--> 98 </div><!--/span-->
99 <div class="span9"> 99 <div class="span9">
100 - <div class="alert alert-info" id="loader">Hold tight we're loading the page that you've requested!</div> 100 + <div class="alert alert-info" id="loader">Wait an instant while we are loading the page that you have requested.</div>
101 101
102 <%= bootstrap_flash %> 102 <%= bootstrap_flash %>
103 <%= yield %> 103 <%= yield %>
app/views/repositories/_unstarted_processing.html.erb
  Diff comments   View file @d743801
1 -<p>This repository has no processings yet. Please hold tight that as soon as possible we'll start it!</p> 1 +<p>This Repository has no processings yet. Please, wait an instant as we start it!</p>
2 2
3 <div id="processing_information"><%= image_tag 'loader.gif' %> Loading data. Please, wait.</div> 3 <div id="processing_information"><%= image_tag 'loader.gif' %> Loading data. Please, wait.</div>
4 \ No newline at end of file 4 \ No newline at end of file