-
Notifications
You must be signed in to change notification settings - Fork 103
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add 'Root folder' and 'Admins' translations and modify some zh-CN translations #53
base: master
Are you sure you want to change the base?
Changes from 6 commits
9809046
388eea3
9487cba
5d44ef3
1232015
54a2d55
21ca7ee
7f4c44a
93ef1f6
2de03e3
145ef57
afbd652
78a5869
47a5233
227ea64
8b9af85
9fa45f0
54d74ff
281a4b7
b8cca72
2a8fea7
0da0c2f
03637ea
e02eb4e
1387634
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,3 +9,4 @@ db/*.sqlite3 | |
log/* | ||
tmp/* | ||
uploads/* | ||
.idea | ||
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,6 +11,6 @@ def reset_password_email(user) | |
|
||
def share_link_email(share_link) | ||
@share_link = share_link | ||
mail(:to => share_link.user.email, :reply_to => share_link.user.email, :bcc => share_link.emails, :subject => t(:share_link_email_subject, :email => share_link.user.email)) | ||
mail(:to => share_link.user.email, :reply_to => share_link.user.email, :bcc => share_link.emails, :subject => t(:share_link_email_subject, :email => share_link.user.email+"("+share_link.user.name+")")) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd prefer it if you do it like this:
|
||
end | ||
end |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -81,13 +81,13 @@ def has_children? | |
end | ||
|
||
def self.root | ||
@root_folder ||= find_by_name_and_parent_id('Root folder', nil) | ||
@root_folder ||= find_by_name_and_parent_id(Folder.human_attribute_name("folder.root_folder"), nil) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I prefer single quotes. Could you please change that in all the |
||
end | ||
|
||
private | ||
|
||
def check_for_parent | ||
raise 'Folders must have a parent.' if parent.nil? && name != 'Root folder' | ||
raise 'Folders must have a parent.' if parent.nil? && name != Folder.human_attribute_name("folder.root_folder") | ||
end | ||
|
||
def create_permissions | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
<h3>剪贴板是空的</h3> | ||
<%= link_to '回去', '#', :class => 'back_link' %>用剪贴板按钮将文件或文件夹加到剪贴板。 | ||
<h3>收藏夹是空的</h3> | ||
<%= link_to '返回', '#', :class => 'back_link' %>用"加到收藏夹"按钮将文件或文件夹加到收藏夹。 |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,4 +15,4 @@ Ihr altes Kennwort ist weiterhin gültig. | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remove the last newline please. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,4 +14,4 @@ Your current password is still valid. | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remove the last newline please. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,4 +14,4 @@ Votre mot de passe actuel reste inchangé. | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remove the last newline please. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,4 +14,4 @@ La password corrente continuerà ad essere valida. | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,4 +14,4 @@ Uw huidige wachtwoord is nog steeds geldig. | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remove the last newline please. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,16 @@ | ||
亲爱的用户: | ||
亲爱的<%= @user.name %>: | ||
|
||
请用下面的网址重设您的Boxroom密码: | ||
请访问如下链接重置您的Boxroom密码: | ||
|
||
<%= edit_reset_password_url(@user.reset_password_token) %> | ||
|
||
提醒一下,您的户头情况: | ||
顺便提醒一下,您的账户信息: | ||
|
||
用户名: <%= @user.name %> | ||
邮箱: <%= @user.email %> | ||
|
||
如果您不曾提交要求重设密码,请忽略这封信。您当前的密码仍然有效。 | ||
注:如果您不曾提交重设密码要求,请忽略此封封信,您当前的密码仍然有效。 | ||
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,4 +17,4 @@ Diese URL wird am <%= l @share_link.link_expires_at, :format => :long %> ablaufe | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remove the last newline please. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,4 +17,4 @@ Le lien ci-dessus expirera à <%= l @share_link.link_expires_at, :format => :tim | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remove the last newline please. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,4 +17,4 @@ L'URL indicato sopra scadrà <%= l @share_link.link_expires_at, :format => :long | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remove the last newline please. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,4 +17,4 @@ De vervaldatum van bovenstaande URL is <%= l @share_link.link_expires_at, :forma | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remove the last newline please. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
亲爱的收件人: | ||
|
||
<%= @share_link.user.email %> 与您共享了一个文件: | ||
<%= @share_link.user.email %> 与您分享了一个文件: | ||
|
||
<%= @share_link.user_file.attachment_file_name %> (<%= number_to_human_size(@share_link.user_file.attachment_file_size, :locale => I18n.locale) %>) | ||
|
||
请用下面的链接下载文件: | ||
请使用如下链接下载文件: | ||
|
||
<%= share_link_url(:id => @share_link.link_token) %> | ||
|
||
此链接会在<%= l @share_link.link_expires_at, :format => :time_only %>,<%= l @share_link.link_expires_at, :format => :date_only %>失效。 | ||
注:此链接会在<%= l @share_link.link_expires_at, :format => :date_only %> <%= l @share_link.link_expires_at, :format => :time_only %>失效。 | ||
|
||
<% unless @share_link.message.blank? -%> | ||
=== <%= t(:shared_message) %>: === | ||
|
@@ -17,4 +17,4 @@ | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remove the last newline please. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,4 +6,4 @@ This is an invitation to sign up for Boxroom. Please use the following URL to si | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remove the last newline please. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,4 +6,4 @@ This is an invitation to sign up for Boxroom. Please use the following URL to si | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remove the last newline please. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,4 +6,4 @@ Ceci est un mail d'invitation à Boxroom. Pour vous inscrire, veuillez utiliser | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remove the last newline please. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,4 +6,4 @@ This is an invitation to sign up for Boxroom. Please use the following URL to si | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remove the last newline please. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,4 +7,4 @@ Gebruik onderstaande URL om uw account aan te maken: | |
|
||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
亲爱的收件人, | ||
|
||
此信邀请你注册Boxroom。请用下面的网址注册: | ||
此封邮件用于邀请您注册Boxroom,请访问如下链接进行注册: | ||
|
||
<%= edit_signup_url(@user.signup_token) %> | ||
-- | ||
Boxroom | ||
http://boxroomapp.com/ | ||
<%= root_url %> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This probably does not apply to most people. Can you take it out?