<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">On 04/22/2015 09:55 AM, Ben Finney
wrote:<br>
<blockquote type="cite">
<div class="moz-text-plain" wrap="true" graphical-quote="true"
style="font-family: -moz-fixed; font-size: 12px;"
lang="x-unicode">
<pre wrap=""># HG changeset patch
# User Ben Finney <a class="moz-txt-link-rfc2396E" href="mailto:ben@benfinney.id.au"><ben@benfinney.id.au></a>
# Date 1429660546 -36000
# Wed Apr 22 09:55:46 2015 +1000
# Node ID 4c08e06b42f9c085b9d69e81bb219fd1c74fd1b0
# Parent 4857d8f170d937383b8bde700494320fff80a88f
Refer to “remote repository” and “clone” consistently in templates.</pre>
</div>
</blockquote>
<br>
Thanks for the patch! A couple of comments ...<br>
<br>
<blockquote type="cite">
<div class="moz-text-plain" wrap="true" graphical-quote="true"
style="font-family: -moz-fixed; font-size: 12px;"
lang="x-unicode">
<pre wrap="">diff --git a/kallithea/templates/admin/repos/repo_add_base.html b/kallithea/templates/admin/repos/repo_add_base.html
--- a/kallithea/templates/admin/repos/repo_add_base.html
+++ b/kallithea/templates/admin/repos/repo_add_base.html
@@ -11,7 +11,10 @@
<div class="input">
${h.text('repo_name',class_="small")}
<div style="margin: 6px 0px 0px 0px">
- <a id="remote_clone_toggle" href="#"><i class="icon-download-cloud"></i> ${_('Import existing repository ?')}</a>
+ <a id="remote_clone_toggle" href="#">
+ <i class="icon-download-cloud"></i>
+ ${_('Clone from an existing repository?')}
+ </a>
</div>
%if not c.authuser.is_admin:
${h.hidden('user_created',True)}
@@ -20,11 +23,13 @@
</div>
<div id="remote_clone" class="field" style="display: none">
<div class="label">
- <label for="clone_uri">${_('Clone from')}:</label>
+ <label for="clone_uri">${_('Clone from remote repo')}:</label></pre>
</div>
</blockquote>
<br>
I don't think the word "repo" is used in other user-facing
messages ... or it shouldn't. It would be nice to consistently
spell it out as repository ... unless there are severe spacing
constraints...<br>
<br>
<blockquote type="cite">
<div class="moz-text-plain" wrap="true" graphical-quote="true"
style="font-family: -moz-fixed; font-size: 12px;"
lang="x-unicode">
<pre wrap="">
</div>
<div class="input">
${h.text('clone_uri',class_="small")}
- <span class="help-block">${_('Optional URL from which repository should be cloned.')}</span>
+ <span class="help-block">
+ ${_('Optional URL of remote repository. If set, this repository will be cloned from remote.')}
+ </span>
</div>
</div>
<div class="field">
diff --git a/kallithea/templates/admin/repos/repo_edit_remote.html b/kallithea/templates/admin/repos/repo_edit_remote.html
--- a/kallithea/templates/admin/repos/repo_edit_remote.html
+++ b/kallithea/templates/admin/repos/repo_edit_remote.html
@@ -1,16 +1,22 @@
%if c.repo_info.clone_uri:
<div style="font-size: 20px; padding: 0px 0px 10px 0px">
- ${_('Remote URL')}: <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a></li>
+ ${_('Remote repo URL')}: <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a></li>
</div>
${h.form(url('edit_repo_remote', repo_name=c.repo_name), method='put')}
<div class="form">
- <div class="fields">
- ${h.submit('remote_pull_%s' % c.repo_info.repo_name,_('Pull Changes from Remote Location'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to pull changes from remote side.')+"');")}
- </div>
+ <div class="fields">
+ ${h.submit(
+ 'remote_pull_%s' % c.repo_info.repo_name,
+ _('Pull Changes from Remote Repo'),
+ class_="btn btn-small",
+ onclick="return confirm('"
+ + _('Confirm to pull changes from remote repository.')
+ + "');")}</pre>
</div>
</blockquote>
<br>
Let's hope no languages use ' in the translation of that string
;-)<br>
<br>
I think the mix of python and javascript would be more readable
with a % formatter ... and javascript and python are so close that
%r might be better than manual quoting.<br>
<br>
<blockquote type="cite">
<div class="moz-text-plain" wrap="true" graphical-quote="true"
style="font-family: -moz-fixed; font-size: 12px;"
lang="x-unicode">
<pre wrap="">
+ </div>
</div>
${h.end_form()}
%else:
- <div style="font-size: 20px">
- ${_('This repository does not have a remote URL set.')}
- </div>
+ <div style="font-size: 20px">
+ ${_('This repository does not have a remote repository URL.')}
+ </div>
%endif
diff --git a/kallithea/templates/admin/repos/repo_edit_settings.html b/kallithea/templates/admin/repos/repo_edit_settings.html
--- a/kallithea/templates/admin/repos/repo_edit_settings.html
+++ b/kallithea/templates/admin/repos/repo_edit_settings.html
@@ -34,7 +34,9 @@
${h.text('clone_uri',class_="medium")}
${h.hidden('clone_uri_change', 'NEW')}
%endif
- <span id="alter_clone_uri_help_block" class="help-block">${_('URL used for doing remote pulls.')}</span>
+ <span id="alter_clone_uri_help_block" class="help-block">
+ ${_('Remote repository URL to pull from.')}
+ </span>
</div>
</div>
<div class="field">
</pre>
</div>
</blockquote>
<br>
/Mads<br>
</div>
</body>
</html>