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>

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