Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add 'Root folder' and 'Admins' translations and modify some zh-CN translations #53

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Add 'Root folder' and 'Admins' translations and modify some zh-CN translations #53

wants to merge 25 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Sep 14, 2016 

➜  boxroom git:(master) ✗ rake test
Run options: --seed 56390

# Running:

.....................................................................

Finished in 2.220083s, 31.0799 runs/s, 145.4900 assertions/s.

69 runs, 323 assertions, 0 failures, 0 errors, 0 skips

marcosantoniocaro and others added 15 commits July 14, 2016 13:52
@marcosantoniocaro
adding spanish translation
9809046
@marcosantoniocaro
adding spanish translation
388eea3
@claudiocebpaz
adding spanish translations views
9487cba
@marcosantoniocaro
Revert "adding spanish translations views"
5d44ef3 
This reverts commit 9487cba.
@marcosantoniocaro
adding spanish translations views
1232015
@924211739
ignore .idea
54a2d55
@924211739
add username to share_link_email subject
21ca7ee
@924211739
translate email and passworld and confirm_password
7f4c44a
@924211739
modify some zh-CN translations and root_url in email template
93ef1f6
@924211739
update root_url in email template
2de03e3
@924211739
add 'Root folder' and 'Admins' translations and modify some zh-CN tra…
145ef57 
…nslations
@mischa78
Updated to Rails 4.2.7.1
afbd652
@mischa78
Minimal Ruby version is 2.1.0 because of Paperclip
78a5869
@mischa78
Merge pull request #52 from marcosantoniocaro/master
47a5233 
Adding spanish translation
@mischa78
Added Spanish language contributors to list of contributors in README
227ea64
mischa78
mischa78 requested changes Oct 1, 2016
View reviewed changes
Copy link
Owner

@mischa78 mischa78 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, this looks good, thank you! I see some minor problems with the code style like using double quotes instead of single quotes and removing newlines at the end of the file. Can you please check my comments and adjust? Thank you very much.

.gitignore
@@ -9,3 +9,4 @@ db/*.sqlite3
log/*
tmp/*
uploads/*
.idea
Copy link
Owner

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?

app/mailers/user_mailer.rb
@@ -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+")"))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer it if you do it like this:

:email => "#{share_link.user.email} (#{share_link.user.name})"

app/models/folder.rb
@@ -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)
Copy link
Owner

@mischa78 mischa78 Oct 1, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer single quotes. Could you please change that in all the human_attribute_name calls?

app/views/user_mailer/reset_password_email.de.text.erb
@@ -15,4 +15,4 @@ Ihr altes Kennwort ist weiterhin gültig.

--
Boxroom
http://boxroomapp.com/
<%= root_url %>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't remove the last newline please.

app/views/user_mailer/reset_password_email.en.text.erb
@@ -14,4 +14,4 @@ Your current password is still valid.

--
Boxroom
http://boxroomapp.com/
<%= root_url %>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't remove the last newline please.

app/views/user_mailer/share_link_email.zh-CN.text.erb
@@ -17,4 +17,4 @@

--
Boxroom
http://boxroomapp.com/
<%= root_url %>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't remove the last newline please.

app/views/user_mailer/signup_email.de.text.erb
@@ -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 %>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't remove the last newline please.

app/views/user_mailer/signup_email.en.text.erb
@@ -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 %>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't remove the last newline please.

app/views/user_mailer/signup_email.it.text.erb
@@ -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 %>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't remove the last newline please.

app/views/user_mailer/signup_email.fr.text.erb
@@ -6,4 +6,4 @@ Ceci est un mail d'invitation à Boxroom. Pour vous inscrire, veuillez utiliser

--
Boxroom
http://boxroomapp.com/
<%= root_url %>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't remove the last newline please.

@ghost
Copy link
Author

ghost commented Oct 8, 2016

Now I have some updates according to your requirements and recommended

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mischa78 @marcosantoniocaro @claudiocebpaz @924211739