jro_apps/redmine Commit - r5403:2a2e6d71e38e

scm: use i18n string at path encoding setting note (#2274, #2664, #3462, #5251)....

Toshi MARUYAMA -

r5403:2a2e6d71e38e

parent child

Context file:

r5403:2a2e6d71e38e

Collapse all files

app/helpers/repositories_helper.rb +12 -8

                                    '<br />Local repository (e.g. /hgrepo, c:\hgrepo)' ) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
-                                    :label => l("field_scm_path_encoding")) +
+                                    :label => l("field_scm_path_encoding")
-                                    '<br />Default: UTF-8')
+                                    ) +
+                                 '<br />' + l("text_scm_path_encoding_note"))
               end
               def git_field_tags(form, repository)
                                    '<br />Bare and local repository (e.g. /gitrepo, c:\gitrepo)') +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
-                                    :label => l("field_scm_path_encoding")) +
+                                    :label => l("field_scm_path_encoding")
-                                    '<br />Default: UTF-8')
+                                    ) +
+                                 '<br />' + l("text_scm_path_encoding_note"))
               end
               def cvs_field_tags(form, repository)
                                  :label => l("field_commit_logs_encoding"), :required => true)) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
-                                 :label => l("field_scm_path_encoding")) +
+                                    :label => l("field_scm_path_encoding")
-                                 '<br />Default: UTF-8')
+                                    ) +
+                                 '<br />' + l("text_scm_path_encoding_note"))
               end
               def bazaar_field_tags(form, repository)
                                  :disabled => (repository && !repository.root_url.blank?))) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
-                                 :label => l("field_scm_path_encoding")) +
+                                    :label => l("field_scm_path_encoding")
-                                 '<br />Default: UTF-8')
+                                    ) +
+                                 '<br />' + l("text_scm_path_encoding_note"))
               end
             end

config/locales/en.yml +1 0

               text_zoom_in: Zoom in
               text_zoom_out: Zoom out
               text_warn_on_leaving_unsaved: "The current page contains unsaved text that will be lost if you leave this page."
+              text_scm_path_encoding_note: "Default: UTF-8"
               default_role_manager: Manager
               default_role_developer: Developer

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