jro_apps/redmine Commit - r5399:bb929f4f7501

scm: use i18n string at commit log encoding setting (#1735)....

Toshi MARUYAMA -

r5399:bb929f4f7501

parent child

Context file:

r5399:bb929f4f7501

Collapse all files

app/helpers/repositories_helper.rb +9 -6

                 content_tag('p', form.text_field(:url, :label => 'Root directory',
                                  :size => 60, :required => true,
                                  :disabled => (repository && !repository.new_record?))) +
-                content_tag('p', form.select(:log_encoding, [nil] + Setting::ENCODINGS,
+                content_tag('p', form.select(
-                                             :label => 'Commit messages encoding', :required => true))
+                                 :log_encoding, [nil] + Setting::ENCODINGS,
+                                 :label => l("field_commit_logs_encoding"), :required => true))
               end
               def mercurial_field_tags(form, repository)
                 content_tag('p', form.text_field(:url, :label => 'Module',
                                  :size => 30, :required => true,
                                  :disabled => !repository.new_record?)) +
-                content_tag('p', form.select(:log_encoding, [nil] + Setting::ENCODINGS,
+                content_tag('p', form.select(
-                                             :label => 'Commit messages encoding', :required => true)) +
+                                 :log_encoding, [nil] + Setting::ENCODINGS,
+                                 :label => l("field_commit_logs_encoding"), :required => true)) +
                 content_tag('p', form.select(
                                  :path_encoding, [nil] + Setting::ENCODINGS,
                                  :label => 'Path encoding') +
                 content_tag('p', form.text_field(:url, :label => 'Root directory',
                                  :size => 60, :required => true,
                                  :disabled => (repository && !repository.new_record?))) +
-                content_tag('p', form.select(:log_encoding, [nil] + Setting::ENCODINGS,
+                content_tag('p', form.select(
-                                             :label => 'Commit messages encoding', :required => true))
+                                 :log_encoding, [nil] + Setting::ENCODINGS,
+                                 :label => l("field_commit_logs_encoding"), :required => true))
               end
               def filesystem_field_tags(form, repository)

app/models/repository.rb +8 0

               # Checks if the SCM is enabled when creating a repository
               validate_on_create { |r| r.errors.add(:type, :invalid) unless Setting.enabled_scm.include?(r.class.name.demodulize) }
+              def self.human_attribute_name(attribute_key_name)
+                attr_name = attribute_key_name
+                if attr_name == "log_encoding"
+                  attr_name = "commit_logs_encoding"
+                end
+                super(attr_name)
+              end
               # Removes leading and trailing whitespace
               def url=(arg)
                 write_attribute(:url, arg ? arg.to_s.strip : nil)

app/models/repository/bazaar.rb 0 -1

               ATTRIBUTE_KEY_NAMES = {
                   "url"          => "Root directory",
-                  "log_encoding" => "Commit messages encoding",
                 }
               def self.human_attribute_name(attribute_key_name)
                 ATTRIBUTE_KEY_NAMES[attribute_key_name] || super

app/models/repository/cvs.rb 0 -1

               ATTRIBUTE_KEY_NAMES = {
                   "root_url"     => "CVSROOT",
                   "url"          => "Module",
-                  "log_encoding" => "Commit messages encoding",
                 }
               def self.human_attribute_name(attribute_key_name)
                 ATTRIBUTE_KEY_NAMES[attribute_key_name] || super

app/models/repository/darcs.rb 0 -1

               ATTRIBUTE_KEY_NAMES = {
                   "url"          => "Root directory",
-                  "log_encoding" => "Commit messages encoding",
                 }
               def self.human_attribute_name(attribute_key_name)
                 ATTRIBUTE_KEY_NAMES[attribute_key_name] || super

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages