##// END OF EJS Templates
rhodecode-enterprise-ce
RSS
emails: optimize some labels, and made few i18n fixes....
marcink -
r532:7cb56fd9 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,48 +1,74 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="base.mako"/>
3 3
4
4 5 <%def name="subject()" filter="n,trim">
5 ${_('[mention]') if mention else ''} ${_('%(user)s commented on a commit of %(repo_name)s') % {
6 <%
7 data = {
6 8 'user': h.person(user),
7 'repo_name': repo_name
8 } }
9 'comment_file': comment_file,
10 'comment_line': comment_line,
11 'repo_name': repo_name,
12 'commit_id': h.show_id(commit),
13 }
14 %>
15 ${_('[mention]') if mention else ''} \
16
17 % if comment_file:
18 ${_('%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)') % data} ${_('in the %(repo_name)s repository') % data}
19 % else:
20 ${_('%(user)s commented on commit `%(commit_id)s`') % data |n} ${_('in the %(repo_name)s repository') % data}
21 % endif
22
9 23 </%def>
10 24
11 25 <%def name="body_plaintext()" filter="n,trim">
12 26 ${self.subject()}
13 27
14 28 * ${_('Comment link')}: ${commit_comment_url}
15 29
16 30 * ${_('Commit')}: ${h.show_id(commit)}
17 31
18 32 %if comment_file:
19 33 * ${_('File: %(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}
20 34 %endif
21 35
22 36 ---
23 37
24 38 ${comment_body|n}
25 39
26 40
27 41 %if status_change:
28 42 ${_('Commit status was changed to')}: *${status_change}*
29 43 %endif
30 44
31 45 ${self.plaintext_footer()}
32 46 </%def>
33 47
48
49 <%
50 data = {
51 'user': h.person(user),
52 'comment_file': comment_file,
53 'comment_line': comment_line,
54 'repo': commit_target_repo,
55 'repo_name': repo_name,
56 'commit_id': h.show_id(commit),
57 }
58 %>
34 59 <table style="text-align:left;vertical-align:middle;">
35 <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;"><h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">
60 <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
36 61 % if comment_file:
37 ${_('%(user)s commented on %(comment_file)s on line %(comment_line)s</a> in the %(repo)s repository') % {'user': h.person(user), 'comment_file': comment_file, 'comment_line': comment_line, 'repo': commit_target_repo} |n}</h4>
62 <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)') % data}</a> ${_('in the %(repo)s repository') % data |n}</h4>
38 63 % else:
39 ${_('%(user)s commented on a commit</a> in the %(repo)s repository') % {'user': h.person(user), 'repo': commit_target_repo} |n}
64 <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s`') % data |n}</a> ${_('in the %(repo)s repository') % data |n}</h4>
40 65 % endif
41 </h4></td></tr>
66 </td></tr>
42 67 <tr><td style="padding-right:20px;padding-top:15px;">${_('Commit')}</td><td style="padding-top:15px;"><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${h.show_id(commit)}</a></td></tr>
43 68 <tr><td style="padding-right:20px;">${_('Description')}</td><td>${h.urlify_commit_message(commit.message, repo_name)}</td></tr>
69
44 70 %if status_change:
45 <tr><td style="padding-right:20px;">${_('Status')}<td/>${_('The commit status was changed to')} ${status_change}.</td></tr>
71 <tr><td style="padding-right:20px;">${_('Status')}</td><td>${_('The commit status was changed to')}: ${status_change}.</td></tr>
46 72 %endif
47 <tr><td style="padding-right:20px;">${_('Comment')}</td><td style="line-height:1.2em;">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
48 </table> No newline at end of file
73 <tr><td style="padding-right:20px;">${(_('Comment on line: %(comment_line)s') if comment_file else _('Comment')) % data}</td><td style="line-height:1.2em;">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
74 </table>
Show file before | Show file after | Hide comments
@@ -1,31 +1,31 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="base.mako"/>
3 3
4 4 <%def name="subject()" filter="n,trim">
5 5 RhodeCode Password reset
6 6 </%def>
7 7
8 8 ## plain text version of the email. Empty by default
9 9 <%def name="body_plaintext()" filter="n,trim">
10 10 Hi ${user.username},
11 11
12 12 There was a request to reset your password using the email address ${email} on ${h.format_date(date)}
13 13
14 14 *If you didn't do this, please contact your RhodeCode administrator.*
15 15
16 16 You can continue, and generate new password by clicking following URL:
17 17 ${password_reset_url}
18 18
19 19 ${self.plaintext_footer()}
20 20 </%def>
21 21
22 22 ## BODY GOES BELOW
23 23 <p>
24 24 Hello ${user.username},
25 25 </p><p>
26 26 There was a request to reset your password using the email address ${email} on ${h.format_date(date)}
27 27 <br/>
28 28 <strong>If you did not request a password reset, please contact your RhodeCode administrator.</strong>
29 29 </p><p>
30 ${_('<a href="%(url)s">Generate new password here</a>.') % {'url': password_reset_url} |n}
31 </p> No newline at end of file
30 <a href="${password_reset_url}">${_('Generate new password here')}.</a>
31 </p>
Show file before | Show file after | Hide comments
@@ -1,30 +1,30 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="base.mako"/>
3 3
4 4 <%def name="subject()" filter="n,trim">
5 5 Your new RhodeCode password
6 6 </%def>
7 7
8 8 ## plain text version of the email. Empty by default
9 9 <%def name="body_plaintext()" filter="n,trim">
10 10 Hi ${user.username},
11 11
12 12 There was a request to reset your password using the email address ${email} on ${h.format_date(date)}
13 13
14 14 *If you didn't do this, please contact your RhodeCode administrator.*
15 15
16 16 You can continue, and generate new password by clicking following URL:
17 17 ${password_reset_url}
18 18
19 19 ${self.plaintext_footer()}
20 20 </%def>
21 21
22 22 ## BODY GOES BELOW
23 23 <p>
24 24 Hello ${user.username},
25 25 </p><p>
26 26 Below is your new access password for RhodeCode.
27 27 <br/>
28 28 <strong>If you didn't request a new password, please contact your RhodeCode administrator.</strong>
29 29 </p>
30 <p>password: <input value='${new_password}'></pre></p> No newline at end of file
30 <p>password: <input value='${new_password}'/></p>
Show file before | Show file after | Hide comments
@@ -1,60 +1,96 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="base.mako"/>
3 3
4
4 5 <%def name="subject()" filter="n,trim">
5 ${_('[mention]') if mention else ''} ${_('%(user)s commented on pull request #%(pr_id)s: "%(pr_title)s"') % {
6 <%
7 data = {
6 8 'user': h.person(user),
7 9 'pr_title': pull_request.title,
8 'pr_id': pull_request.pull_request_id
9 } |n}
10 'pr_id': pull_request.pull_request_id,
11 'status': status_change,
12 'comment_file': comment_file,
13 'comment_line': comment_line,
14 }
15 %>
16
17 ${_('[mention]') if mention else ''} \
18
19 % if comment_file:
20 ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file: `%(comment_file)s`)') % data |n}
21 % else:
22 % if status_change:
23 ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (status: %(status)s)') % data |n}
24 % else:
25 ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
26 % endif
27
28 % endif
10 29 </%def>
11 30
12 31 <%def name="body_plaintext()" filter="n,trim">
32 <%
33 data = {
34 'user': h.person(user),
35 'pr_title': pull_request.title,
36 'pr_id': pull_request.pull_request_id,
37 'status': status_change,
38 'comment_file': comment_file,
39 'comment_line': comment_line,
40 }
41 %>
13 42 ${self.subject()}
14 43
15 44 * ${_('Comment link')}: ${pr_comment_url}
16 45
17 46 * ${_('Source repository')}: ${pr_source_repo_url}
18 47
19 48 %if comment_file:
20 49 * ${_('File: %(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}
21 50 %endif
22 51
23 52 ---
24 53
54 %if status_change and not closing_pr:
55 ${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s*') % data}
56 %elif status_change and closing_pr:
57 ${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*') % data}
58 %endif
59
25 60 ${comment_body|n}
26 61
27 62
28 %if status_change and not closing_pr:
29 ${_('Pull request status was changed to')}: *${status_change}*
30 %elif status_change and closing_pr:
31 ${_('Pull request was closed with status')}: *${status_change}*
32 %endif
33
34 63 ${self.plaintext_footer()}
35 64 </%def>
36 65
66
67 <%
68 data = {
69 'user': h.person(user),
70 'pr_title': pull_request.title,
71 'pr_id': pull_request.pull_request_id,
72 'status': status_change,
73 'comment_file': comment_file,
74 'comment_line': comment_line,
75 }
76 %>
37 77 <table style="text-align:left;vertical-align:middle;">
38 <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;"><h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">
78 <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
79 <h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">
80
39 81 % if comment_file:
40 ${_('%(user)s commented on %(comment_file)s on pull request #%(pr_id)s: "%(pr_title)s".') % {'user': h.person(user), 'comment_file': comment_file, 'pr_title': pull_request.title, 'pr_id': pull_request.pull_request_id} |n}
41 % elif status_change and not closing_pr:
42 ${_('%(user)s changed the status of pull request #%(pr_id)s "%(pr_title)s" to %(status)s.') % {'user': h.person(user),'pr_title': pull_request.title,'pr_id': pull_request.pull_request_id, 'status': status_change} |n}
43 %elif status_change and closing_pr:
44 ${_('%(user)s closed pull request #%(pr_id)s "%(pr_title)s" with status %(status)s.') % {'user': h.person(user),'pr_title': pull_request.title,'pr_id': pull_request.pull_request_id, 'status': status_change} |n}
82 ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file:`%(comment_file)s`)') % data |n}
45 83 %else:
46 ${_('%(user)s commented in pull request #%(pr_id)s "%(pr_title)s".') % {'user': h.person(user),'pr_title': pull_request.title,'pr_id': pull_request.pull_request_id} |n}
84 ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
47 85 % endif
48 </a></h4></td></tr>
49 <tr><td style="padding-right:20px;padding-top:15px;">${_('Source')}</td><td style="padding-top:15px;"><a style="color:#427cc9;text-decoration:none;cursor:pointer" href="${pr_source_repo_url}">${pr_source_repo.repo_name}</a></td></tr>
50 % if comment_file:
51 <tr><td style="padding-right:20px;">${_('File')}</td><td>${_('%(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}</td></tr>
52 %endif
86 </a>
53 87 %if status_change and not closing_pr:
54 <tr><td style="padding-right:20px;">${_('Status')}</td><td>${_('The commit status was changed to')} ${status_change}</td></tr>
88 , ${_('submitted pull request status: %(status)s') % data}
55 89 %elif status_change and closing_pr:
56 <tr><td style="padding-right:20px;">${_('Status')}</td><td>${_('Pull request was closed with status')}: ${status_change}</td></tr>
90 , ${_('submitted pull request status: %(status)s and closed') % data}
57 91 %endif
58 <tr><td style="padding-right:20px;">${_('Comment')}</td><td style="line-height:1.2em;">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
92 </h4>
93 </td></tr>
94 <tr><td style="padding-right:20px;padding-top:15px;">${_('Source')}</td><td style="padding-top:15px;"><a style="color:#427cc9;text-decoration:none;cursor:pointer" href="${pr_source_repo_url}">${pr_source_repo.repo_name}</a></td></tr>
95 <tr><td style="padding-right:20px;">${(_('Comment on line: %(comment_line)s') if comment_file else _('Comment')) % data}</td><td style="line-height:1.2em;">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
59 96 </table>
60
Show file before | Show file after | Hide comments
@@ -1,78 +1,78 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="base/root.html"/>
3 3
4 4 <%def name="title()">
5 5 ${_('Create an Account')}
6 6 %if c.rhodecode_name:
7 7 &middot; ${h.branding(c.rhodecode_name)}
8 8 %endif
9 9 </%def>
10 10 <style>body{background-color:#eeeeee;}</style>
11 11
12 12 <div class="loginbox">
13 13 <div class="header">
14 14 <div id="header-inner" class="title">
15 15 <div id="logo">
16 16 <div class="logo-wrapper">
17 17 <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
18 18 </div>
19 19 %if c.rhodecode_name:
20 20 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
21 21 %endif
22 22 </div>
23 23 </div>
24 24 </div>
25 25
26 26 <div class="loginwrapper">
27 27 <div class="left-column">
28 28 <img class="sign-in-image" src="${h.asset('images/sign-in.png')}" alt="RhodeCode"/>
29 29 </div>
30 30
31 31 <div id="register" class="right-column">
32 32 <%include file="/base/flash_msg.html"/>
33 33 <!-- login -->
34 34 <div class="sign-in-title">
35 35 <h1>${_('Reset your Password')}</h1>
36 36 <h4>${h.link_to(_("Go to the login page to sign in."), request.route_path('login'))}</h4>
37 37 </div>
38 38 <div class="inner form">
39 39 ${h.form(request.route_path('reset_password'), needs_csrf_token=False)}
40 40 <label for="email">${_('Email Address')}:</label>
41 41 ${h.text('email', defaults.get('email'))}
42 42 %if 'email' in errors:
43 43 <span class="error-message">${errors.get('email')}</span>
44 44 <br />
45 45 %endif
46 46
47 47 %if captcha_active:
48 48 <div class="login-captcha"
49 49 <label for="email">${_('Captcha')}:</label>
50 50 ${h.hidden('recaptcha_field')}
51 51 <div id="recaptcha"></div>
52 52 %if 'recaptcha_field' in errors:
53 53 <span class="error-message">${errors.get('recaptcha_field')}</span>
54 54 <br />
55 55 %endif
56 56 </div>
57 57 %endif
58 58
59 59 ${h.submit('send', _('Send password reset email'), class_="btn sign-in")}
60 <div class="activation_msg">${_('Password reset link will be send to matching email address')}</div>
60 <div class="activation_msg">${_('Password reset link will be sent to matching email address')}</div>
61 61
62 62 ${h.end_form()}
63 63 </div>
64 64 </div>
65 65 </div>
66 66 </div>
67 67
68 68 %if captcha_active:
69 69 <script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
70 70 %endif
71 71 <script type="text/javascript">
72 72 $(document).ready(function(){
73 73 $('#email').focus();
74 74 %if captcha_active:
75 75 Recaptcha.create("${captcha_public_key}", "recaptcha", {theme: "white"});
76 76 %endif
77 77 });
78 78 </script>
General Comments 0
You need to be logged in to leave comments. Login now