kallithea Changeset - 0bc8975f5365

Changeset - 0bc8975f5365

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

Thomas De Schampheleire - 11 years ago 2015-03-12 22:19:57
thomas.de.schampheleire@gmail.com

controllers: trivial typo fixes

7 files changed with 14 insertions and 14 deletions:

kallithea/controllers/admin/auth_settings.py

kallithea/controllers/admin/gists.py

kallithea/controllers/admin/repos.py

kallithea/controllers/api/api.py

kallithea/controllers/changeset.py

kallithea/controllers/files.py

kallithea/controllers/pullrequests.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/auth_settings.py

➞

Show inline comments

@@ @@ -86,7 +86,7 @@ class AuthSettingsController(BaseControl @@
                 setting = Setting.get_by_name(fullname)
                 if setting:
                     _defaults[fullname] = setting.app_settings_value
-        # we want to show , seperated list of enabled plugins
+        # we want to show , separated list of enabled plugins
         _defaults['auth_plugins'] = ','.join(_defaults['auth_plugins'])
         if defaults:
             _defaults.update(defaults)

kallithea/controllers/admin/gists.py

➞

Show inline comments

@@ @@ -285,7 +285,7 @@ class GistsController(BaseController): @@
         ##TODO: maybe move this to model ?
         if revision != last_rev.raw_id:
-            log.error('Last revision %s is different then submited %s'
+            log.error('Last revision %s is different than submitted %s'
                       % (revision, last_rev))
             # our gist has newer version than we
             success = False

kallithea/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -508,8 +508,8 @@ class ReposController(BaseRepoController @@
     @HasRepoPermissionAllDecorator('repository.admin')
     def edit_advanced_journal(self, repo_name):
         """
         Set's this repository to be visible in public journal,
         in other words assing default user to follow this repo
         Sets this repository to be visible in public journal,
         in other words asking default user to follow this repo
         :param repo_name:
         """

kallithea/controllers/api/api.py

➞

Show inline comments

@@ @@ -308,7 +308,7 @@ class ApiController(JSONRPCController): @@
              userid=Optional(OAttr('apiuser'))):
         """
         Set locking state on given repository by given user. If userid param
-        is skipped, then it is set to id of user whos calling this method.
+        is skipped, then it is set to id of user who is calling this method.
         If locked param is skipped then function shows current lock state of
         given repo. This command can be executed only using api_key belonging
         to user with admin rights or regular user that have admin or write
@@ @@ -426,7 +426,7 @@ class ApiController(JSONRPCController): @@
     def get_locks(self, apiuser, userid=Optional(OAttr('apiuser'))):
         """
         Get all repositories with locks for given userid, if
-        this command is runned by non-admin account userid is set to user
+        this command is run by non-admin account userid is set to user
         who is calling this method, thus returning locks for himself.
         :param apiuser: filled automatically from apikey
@@ @@ -535,7 +535,7 @@ class ApiController(JSONRPCController): @@
     def get_user(self, apiuser, userid=Optional(OAttr('apiuser'))):
         """
-        Get's an user by username or user_id, Returns empty result if user is
+        Gets a user by username or user_id, Returns empty result if user is
         not found. If userid param is skipped it is set to id of user who is
         calling this method. This command can be executed only using api_key
         belonging to user with admin rights, or regular users that cannot
@@ @@ -559,7 +559,7 @@ class ApiController(JSONRPCController): @@
                         "lastname" :    "<lastname>",
                         "email" :       "<email>",
                         "emails":       "[<list of all emails including additional ones>]",
-                        "ip_addresses": "[<ip_addresse_for_user>,...]",
+                        "ip_addresses": "[<ip_address_for_user>,...]",
                         "active" :      "<bool: user active>",
                         "admin" :       "<bool: user is admin>",
                         "extern_name" : "<extern_name>",
@@ @@ -1513,7 +1513,7 @@ class ApiController(JSONRPCController): @@
             return dict(
                 msg="Created new repository `%s`" % (repo_name,),
                 success=True,  # cannot return the repo data here since fork
-                               # cann be done async
+                               # can be done async
                 task=task_id
+            )
         except Exception:
@@ @@ -1593,7 +1593,7 @@ class ApiController(JSONRPCController): @@
                   private=Optional(False), landing_rev=Optional('rev:tip')):
         """
         Creates a fork of given repo. In case of using celery this will
-        immidiatelly return success message, while fork is going to be created
+        immediately return success message, while fork is going to be created
         asynchronous. This command can be executed only using api_key belonging to
         user with admin rights or regular user that have fork permission, and at least
         read access to forking repository. Regular users cannot specify owner parameter.
@@ @@ -1687,7 +1687,7 @@ class ApiController(JSONRPCController): @@
                 msg='Created fork of `%s` as `%s`' % (repo.repo_name,
                                                       fork_name),
                 success=True,  # cannot return the repo data here since fork
-                               # cann be done async
+                               # can be done async
                 task=task_id
+            )
         except Exception:

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -15,7 +15,7 @@ @@
 kallithea.controllers.changeset
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-changeset controller for pylons showoing changes beetween
+changeset controller for pylons showing changes between
 revisions
 This file was forked by the Kallithea project in July 2014.

kallithea/controllers/files.py

➞

Show inline comments

@@ @@ -583,7 +583,7 @@ class FilesController(BaseRepoController @@
                     if fd:  # fd means we used temporary file
                         os.close(fd)
                     if not archive_cache_enabled:
-                        log.debug('Destroing temp archive %s' % archive)
+                        log.debug('Destroying temp archive %s' % archive)
                         os.remove(archive)
                     break
                 yield data

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -571,7 +571,7 @@ class PullrequestsController(BaseRepoCon @@
                     c.a_branch_name = 'null' # not a branch name ... but close enough
             # candidates: descendants of old head that are on the right branch
             #             and not are the old head itself ...
-            #             and nothing at all if old head is a descendent of target ref name
+            #             and nothing at all if old head is a descendant of target ref name
             if other_scm_instance._repo.revs('present(%s)::&%s', c.cs_ranges[-1].raw_id, c.a_branch_name):
                 c.update_msg = _('This pull request has already been merged to %s.') % c.a_branch_name
             elif c.pull_request.is_closed():

0 comments (0 inline, 0 general)