From 3036eaba5238e68381dcfdbcdfc99c4c7e7c795a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 21 Jun 2015 16:38:29 +0000 Subject: [PATCH] Replace tabs with spaces and remove trailing tabs in several files (#20140). Patch by Mischa The Evil. git-svn-id: http://svn.redmine.org/redmine/trunk@14365 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/mail_handler_controller.rb | 2 +- app/helpers/issues_helper.rb | 2 +- app/helpers/settings_helper.rb | 2 +- app/models/issue.rb | 2 +- doc/COPYING | 14 +++++++------- lib/generators/redmine_plugin/USAGE | 2 +- .../acts_as_versioned/lib/acts_as_versioned.rb | 2 +- public/help/ar/wiki_syntax_detailed_textile.html | 6 +++--- public/help/az/wiki_syntax_detailed_textile.html | 6 +++--- public/help/bg/wiki_syntax_detailed_textile.html | 6 +++--- public/help/bs/wiki_syntax_detailed_textile.html | 6 +++--- public/help/ca/wiki_syntax_detailed_textile.html | 6 +++--- public/help/cs/wiki_syntax_detailed_textile.html | 6 +++--- public/help/da/wiki_syntax_detailed_textile.html | 6 +++--- public/help/de/wiki_syntax_detailed_textile.html | 6 +++--- public/help/el/wiki_syntax_detailed_textile.html | 6 +++--- .../help/en-gb/wiki_syntax_detailed_textile.html | 6 +++--- public/help/en/wiki_syntax_detailed_textile.html | 6 +++--- .../help/es-pa/wiki_syntax_detailed_textile.html | 6 +++--- public/help/es/wiki_syntax_detailed_textile.html | 6 +++--- public/help/et/wiki_syntax_detailed_textile.html | 6 +++--- public/help/eu/wiki_syntax_detailed_textile.html | 6 +++--- public/help/fa/wiki_syntax_detailed_textile.html | 6 +++--- public/help/fi/wiki_syntax_detailed_textile.html | 6 +++--- public/help/fr/wiki_syntax_detailed_textile.html | 6 +++--- public/help/gl/wiki_syntax_detailed_textile.html | 6 +++--- public/help/he/wiki_syntax_detailed_textile.html | 6 +++--- public/help/hr/wiki_syntax_detailed_textile.html | 6 +++--- public/help/hu/wiki_syntax_detailed_textile.html | 6 +++--- public/help/id/wiki_syntax_detailed_textile.html | 6 +++--- public/help/it/wiki_syntax_detailed_textile.html | 6 +++--- public/help/ja/wiki_syntax_detailed_textile.html | 6 +++--- public/help/ko/wiki_syntax_detailed_textile.html | 6 +++--- public/help/lt/wiki_syntax_detailed_textile.html | 6 +++--- public/help/lv/wiki_syntax_detailed_textile.html | 6 +++--- public/help/mk/wiki_syntax_detailed_textile.html | 6 +++--- public/help/mn/wiki_syntax_detailed_textile.html | 6 +++--- public/help/nl/wiki_syntax_detailed_textile.html | 6 +++--- public/help/no/wiki_syntax_detailed_textile.html | 6 +++--- public/help/pl/wiki_syntax_detailed_textile.html | 6 +++--- .../help/pt-br/wiki_syntax_detailed_textile.html | 6 +++--- public/help/pt/wiki_syntax_detailed_textile.html | 6 +++--- public/help/ro/wiki_syntax_detailed_textile.html | 6 +++--- public/help/ru/wiki_syntax_detailed_textile.html | 6 +++--- public/help/sk/wiki_syntax_detailed_textile.html | 6 +++--- public/help/sl/wiki_syntax_detailed_textile.html | 6 +++--- public/help/sq/wiki_syntax_detailed_textile.html | 6 +++--- .../help/sr-yu/wiki_syntax_detailed_textile.html | 6 +++--- public/help/sr/wiki_syntax_detailed_textile.html | 6 +++--- public/help/sv/wiki_syntax_detailed_textile.html | 6 +++--- public/help/th/wiki_syntax_detailed_textile.html | 6 +++--- public/help/tr/wiki_syntax_detailed_textile.html | 6 +++--- public/help/uk/wiki_syntax_detailed_textile.html | 6 +++--- public/help/vi/wiki_syntax_detailed_textile.html | 6 +++--- .../help/zh-tw/wiki_syntax_detailed_textile.html | 6 +++--- public/help/zh/wiki_syntax_detailed_textile.html | 6 +++--- public/htaccess.fcgi.example | 8 ++++---- public/stylesheets/jstoolbar.css | 2 +- test/unit/member_test.rb | 2 +- 59 files changed, 166 insertions(+), 166 deletions(-) diff --git a/app/controllers/mail_handler_controller.rb b/app/controllers/mail_handler_controller.rb index 53d37ae7d..7ae2f64fe 100644 --- a/app/controllers/mail_handler_controller.rb +++ b/app/controllers/mail_handler_controller.rb @@ -18,7 +18,7 @@ class MailHandlerController < ActionController::Base before_filter :check_credential - # Displays the email submission form + # Displays the email submission form def new end diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 753f0fd43..d803df0cc 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -249,7 +249,7 @@ module IssuesHelper issues = [issues] unless issues.is_a?(Array) message = l(:text_issues_destroy_confirmation) - descendant_count = issues_descendant_count(issues) + descendant_count = issues_descendant_count(issues) if descendant_count > 0 message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count) end diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 5c747f0d2..17a4f49af 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -158,7 +158,7 @@ module SettingsHelper options.map {|label, value| [l(label), value.to_s]} end - # Returns the options for the date_format setting + # Returns the options for the date_format setting def date_format_setting_options(locale) Setting::DATE_FORMATS.map do |f| today = ::I18n.l(Date.today, :locale => locale, :format => f) diff --git a/app/models/issue.rb b/app/models/issue.rb index 928dedc91..e7c02ea2e 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -425,7 +425,7 @@ class Issue < ActiveRecord::Base names -= disabled_core_fields names -= read_only_attribute_names(user) if new_record? - # Make sure that project_id can always be set for new issues + # Make sure that project_id can always be set for new issues names |= %w(project_id) end if dates_derived? diff --git a/doc/COPYING b/doc/COPYING index d511905c1..d159169d1 100644 --- a/doc/COPYING +++ b/doc/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it diff --git a/lib/generators/redmine_plugin/USAGE b/lib/generators/redmine_plugin/USAGE index 793f2fc5e..c500d54dd 100644 --- a/lib/generators/redmine_plugin/USAGE +++ b/lib/generators/redmine_plugin/USAGE @@ -1,6 +1,6 @@ Description: The plugin generator creates stubs for a new Redmine plugin. - + Example: ./script/rails generate redmine_plugin meetings create plugins/meetings/app diff --git a/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb b/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb index adb9fed86..ffd344293 100644 --- a/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb +++ b/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb @@ -379,7 +379,7 @@ module ActiveRecord #:nodoc: new_model.send("#{key}=", orig_model.send(key)) if orig_model.respond_to?(key) end - if self.class.columns_hash.include?(self.class.inheritance_column) + if self.class.columns_hash.include?(self.class.inheritance_column) if orig_model.is_a?(self.class.versioned_class) new_model[new_model.class.inheritance_column] = orig_model[self.class.versioned_inheritance_column] elsif new_model.is_a?(self.class.versioned_class) diff --git a/public/help/ar/wiki_syntax_detailed_textile.html b/public/help/ar/wiki_syntax_detailed_textile.html index 694cd501b..02f707e68 100644 --- a/public/help/ar/wiki_syntax_detailed_textile.html +++ b/public/help/ar/wiki_syntax_detailed_textile.html @@ -126,7 +126,7 @@