kallithea Changeset - 53d766fc9782

Changeset - 53d766fc9782

Parent rev.

Child rev.

[Not reviewed]

default

0 8 0

Thomas De Schampheleire - 11 years ago 2015-02-03 21:39:31
thomas.de_schampheleire@alcatel-lucent.com

spelling: consistent capitalization of URL

Change Url / url into URL.
Additionally, convert the sole use of 'Uri' to URL.

8 files changed with 19 insertions and 19 deletions:

kallithea/model/validators.py

kallithea/templates/admin/repos/repo_add_base.html

kallithea/templates/admin/repos/repo_edit_remote.html

kallithea/templates/admin/repos/repo_edit_settings.html

kallithea/templates/admin/settings/settings_system.html

kallithea/templates/admin/settings/settings_visual.html

kallithea/templates/summary/summary.html

kallithea/tests/functional/test_admin_repos.py

0 comments (0 inline, 0 general)

kallithea/model/validators.py

➞

Show inline comments

@@ @@ -471,9 +471,9 @@ def ValidCloneUri(): @@
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'clone_uri': _(u'invalid clone url'),
             'invalid_clone_uri': _(u'Invalid clone url, provide a '
                                     'valid clone http(s)/svn+http(s)/ssh url')
             'clone_uri': _(u'invalid clone URL'),
             'invalid_clone_uri': _(u'Invalid clone URL, provide a '
                                     'valid clone http(s)/svn+http(s)/ssh URL')
+        }
         def validate_python(self, value, state):
@@ @@ -486,7 +486,7 @@ def ValidCloneUri(): @@
                 try:
                     url_handler(repo_type, url, make_ui('db', clear_session=False))
                 except Exception:
-                    log.exception('Url validation failed')
+                    log.exception('URL validation failed')
                     msg = M(self, 'clone_uri')
                     raise formencode.Invalid(msg, value, state,
                         error_dict=dict(clone_uri=msg)

kallithea/templates/admin/repos/repo_add_base.html

➞

Show inline comments

@@ @@ -24,7 +24,7 @@ ${h.form(url('repos'))} @@
             </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 from which repository should be cloned.')}</span>
             </div>
         </div>
         <div class="field">

kallithea/templates/admin/repos/repo_edit_remote.html

➞

Show inline comments

 %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 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">
@@ @@ -11,6 +11,6 @@ ${h.form(url('edit_repo_remote', repo_na @@
 ${h.end_form()}
 %else:
   <div style="font-size: 20px">
-    ${_('This repository does not have a remote url set.')}
+    ${_('This repository does not have a remote URL set.')}
   </div>
 %endif

kallithea/templates/admin/repos/repo_edit_settings.html

➞

Show inline comments

@@ @@ -11,14 +11,14 @@ ${h.form(url('repo', repo_name=c.repo_in @@
                     <span class="help-block">${_('Non-changeable id')}: `_${c.repo_info.repo_id}` <span><a id="show_more_clone_id" href="#">${_('What is that?')}</a></span></span>
                     <span id="clone_id" class="help-block" style="display: none">
                         ${_('URL by id')}: `${c.repo_info.clone_url(with_id=True)}` </br>
                         ${_('''In case this repository is renamed or moved into another group the repository url changes.
                                Using the above url guarantees that this repository will always be accessible under such url.
                                Useful for CI systems, or any other cases that you need to hardcode the url into 3rd party service.''')}</span>
                         ${_('''In case this repository is renamed or moved into another group the repository URL changes.
                                Using the above URL guarantees that this repository will always be accessible under such URL.
                                Useful for CI systems, or any other cases that you need to hardcode the URL into 3rd party service.''')}</span>
                 </div>
            </div>
            <div class="field">
                <div class="label">
-                   <label for="clone_uri">${_('Clone uri')}:</label>
+                   <label for="clone_uri">${_('Clone URL')}:</label>
                </div>
                <div class="input">
                    %if c.repo_info.clone_uri:
@@ @@ -34,7 +34,7 @@ ${h.form(url('repo', repo_name=c.repo_in @@
                     ${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">${_('URL used for doing remote pulls.')}</span>
                </div>
             </div>
             <div class="field">

kallithea/templates/admin/settings/settings_system.html

➞

Show inline comments

@@ @@ -6,7 +6,7 @@ @@
     (_('Platform'), c.platform, ''),
     (_('Git version'), c.git_version, ''),
     (_('Git path'), c.ini.get('git_path'), ''),
-    (_('Upgrade info endpoint'), h.literal('%s <br/><span style="color:#999999">%s.</span>' % (c.update_url, _('Note: please make sure this server can access this url'))), '')
+    (_('Upgrade info endpoint'), h.literal('%s <br/><span style="color:#999999">%s.</span>' % (c.update_url, _('Note: please make sure this server can access this URL'))), '')
+ ]
 %>

kallithea/templates/admin/settings/settings_visual.html

➞

Show inline comments

@@ @@ -27,8 +27,8 @@ ${h.form(url('admin_settings_visual'), m @@
                 <div class="field">
                     <div class="input">
                         ${h.text('gravatar_url', size=80)}
                         <span class="help-block">${_('''Gravatar url allows you to use another avatar server application.
                                                         The following variables of the url will be replaced accordingly.
                         <span class="help-block">${_('''Gravatar URL allows you to use another avatar server application.
                                                         The following variables of the URL will be replaced accordingly.
                                                         {scheme}    'http' or 'https' sent from running Kallithea server,
                                                         {email}     user email,
                                                         {md5email}  md5 hash of the user email (like at gravatar.com),
@@ @@ -39,7 +39,7 @@ ${h.form(url('admin_settings_visual'), m @@
                 <div class="field">
                     <div class="input">
                         ${h.text('clone_uri_tmpl', size=80)}
-                        <span class="help-block">${_('''Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'.
+                        <span class="help-block">${_('''Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.
                                                         The following variables are available:
                                                         {scheme} 'http' or 'https' sent from running Kallithea server,
                                                         {user}   current user username,

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -72,7 +72,7 @@ summary = lambda n:{False:'summary-short @@
         <div id="summary" class="fields">
             <div class="field">
                 <div class="label-summary">
-                  <label>${_('Clone url')}:</label>
+                  <label>${_('Clone URL')}:</label>
                 </div>
                 <div class="input ${summary(c.show_stats)}">
                   <input style="width:80%" type="text" id="clone_url" readonly="readonly" value="${c.clone_repo_url}"/>

kallithea/tests/functional/test_admin_repos.py

➞

Show inline comments

@@ @@ -339,7 +339,7 @@ class _BaseTest(TestController): @@
                                                 repo_type=self.REPO_TYPE,
                                                 repo_description=description,
                                                 clone_uri='http://127.0.0.1/repo'))
-        response.mustcontain('invalid clone url')
+        response.mustcontain('invalid clone URL')
     def test_create_remote_repo_wrong_clone_uri_hg_svn(self):
@@ @@ -352,7 +352,7 @@ class _BaseTest(TestController): @@
                                                 repo_type=self.REPO_TYPE,
                                                 repo_description=description,
                                                 clone_uri='svn+http://127.0.0.1/repo'))
-        response.mustcontain('invalid clone url')
+        response.mustcontain('invalid clone URL')
     def test_delete(self):

0 comments (0 inline, 0 general)