diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2017-04-02 03:34:44 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2017-04-02 03:34:44 +0000 |
| commit | 6139e0033a0435f526f16b5df9b1e597402d3377 (patch) | |
| tree | 2863f34c452528dfa9104d614970b7c6220d8434 /app/models | |
| parent | adce697d9964be3092b358ea5fc10b399964cb19 (diff) | |
| download | redmine-6139e0033a0435f526f16b5df9b1e597402d3377.tar.gz redmine-6139e0033a0435f526f16b5df9b1e597402d3377.zip | |
spelling fixes (#25495)
git-svn-id: http://svn.redmine.org/redmine/trunk@16445 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/enumeration.rb | 6 | ||||
| -rw-r--r-- | app/models/member.rb | 2 | ||||
| -rw-r--r-- | app/models/repository/cvs.rb | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index fc8486174..7b20394b2 100644 --- a/app/models/enumeration.rb +++ b/app/models/enumeration.rb @@ -136,7 +136,7 @@ class Enumeration < ActiveRecord::Base end # Overrides Redmine::Acts::Positioned#set_default_position so that enumeration overrides - # get the same position as the overriden enumeration + # get the same position as the overridden enumeration def set_default_position if position.nil? && parent self.position = parent.position @@ -145,7 +145,7 @@ class Enumeration < ActiveRecord::Base end # Overrides Redmine::Acts::Positioned#update_position so that overrides get the same - # position as the overriden enumeration + # position as the overridden enumeration def update_position super if position_changed? @@ -159,7 +159,7 @@ class Enumeration < ActiveRecord::Base end # Overrides Redmine::Acts::Positioned#remove_position so that enumeration overrides - # get the same position as the overriden enumeration + # get the same position as the overridden enumeration def remove_position if parent_id.blank? super diff --git a/app/models/member.rb b/app/models/member.rb index d709f5ff7..24376d303 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -194,7 +194,7 @@ class Member < ActiveRecord::Base members end - # Finds or initilizes a Member for the given project and principal + # Finds or initializes a Member for the given project and principal def self.find_or_new(project, principal) project_id = project.is_a?(Project) ? project.id : project principal_id = principal.is_a?(Principal) ? principal.id : principal diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb index 565c3b3f8..ca0be52de 100644 --- a/app/models/repository/cvs.rb +++ b/app/models/repository/cvs.rb @@ -151,7 +151,7 @@ class Repository::Cvs < Repository # create a new changeset.... unless cs # we use a temporary revision number here (just for inserting) - # later on, we calculate a continous positive number + # later on, we calculate a continuous positive number tmp_time2 = tmp_time.clone.gmtime branch = revision.paths[0][:branch] scmid = branch + "-" + tmp_time2.strftime("%Y%m%d-%H%M%S") @@ -163,7 +163,7 @@ class Repository::Cvs < Repository :comments => revision.message) tmp_rev_num += 1 end - # convert CVS-File-States to internal Action-abbrevations + # convert CVS-File-States to internal Action-abbreviations # default action is (M)odified action = "M" if revision.paths[0][:action] == "Exp" && revision.paths[0][:revision] == "1.1" |