jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'guange_dev' into szzh

This commit is contained in:
sw 2015-05-23 15:19:01 +08:00
parent c4c2da48db 3b433cb751
commit 74fe58217f
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/settings/_general.html.erb
View File

@ -15,6 +15,11 @@
<p style="padding-left: 180px;"><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p> <p style="padding-left: 180px;"><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
<p style="padding-left: 180px;"><%= setting_text_field :host_name, :size => 60 %> <p style="padding-left: 180px;"><%= setting_text_field :host_name, :size => 60 %>
<p style="padding-left: 180px;"><%= setting_text_field :host_course, :size => 60 %>
<p style="padding-left: 180px;"><%= setting_text_field :host_contest, :size => 60 %>
<p style="padding-left: 180px;"><%= setting_text_field :host_user, :size => 60 %>
<p style="padding-left: 180px;"><%= setting_text_field :host_repository, :size => 60 %>
<em class="info"><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p> <em class="info"><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p>
<p style="padding-left: 180px;"><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p> <p style="padding-left: 180px;"><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p>

4
config/locales/en.yml
View File

@ -183,6 +183,10 @@ en:
setting_bcc_recipients: Blind carbon copy recipients (bcc) setting_bcc_recipients: Blind carbon copy recipients (bcc)
setting_plain_text_mail: Plain text mail (no HTML) setting_plain_text_mail: Plain text mail (no HTML)
setting_host_name: Host name and path setting_host_name: Host name and path
setting_host_course: Host course and path
setting_host_contest: Host contest and path
setting_host_user: Host user and path
setting_host_repository: Host repository and path
setting_text_formatting: Text formatting setting_text_formatting: Text formatting
setting_wiki_compression: Wiki history compression setting_wiki_compression: Wiki history compression
setting_feeds_limit: Maximum number of items in Atom feeds setting_feeds_limit: Maximum number of items in Atom feeds

4
config/locales/zh.yml
View File

@ -190,6 +190,10 @@ zh:
setting_bcc_recipients: 使用密件抄送 (bcc) setting_bcc_recipients: 使用密件抄送 (bcc)
setting_plain_text_mail: 纯文本（无HTML） setting_plain_text_mail: 纯文本（无HTML）
setting_host_name: 主机名称 setting_host_name: 主机名称
setting_host_course: 课程域名
setting_host_contest: 竞赛域名
setting_host_user: 用户域名
setting_host_repository: 仓库域名
setting_text_formatting: 文本格式 setting_text_formatting: 文本格式
setting_wiki_compression: 压缩Wiki历史文档 setting_wiki_compression: 压缩Wiki历史文档
setting_feeds_limit: RSS Feed内容条数限制 setting_feeds_limit: RSS Feed内容条数限制