diff --git a/docs/changelog.rst b/docs/changelog.rst --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -139,8 +139,8 @@ fixes When this is used together with mercurial internal translation system it can lead to UnicodeDecodeErrors - fixes #645 Fix git handler when doing delete remote branch -- implements #649 added two seperate method for author and commiter to VCS - changeset class switch author for git backed to be the real author not commiter +- implements #649 added two seperate method for author and committer to VCS + changeset class switch author for git backed to be the real author not committer - fix issue #504 RhodeCode is showing different versions of README on different summary page loads - implemented #658 Changing username in LDAP-Mode should not be allowed. diff --git a/docs/setup.rst b/docs/setup.rst --- a/docs/setup.rst +++ b/docs/setup.rst @@ -478,7 +478,7 @@ Changing default encoding By default RhodeCode uses utf8 encoding, starting from 1.3 series this can be changed, simply edit default_encoding in .ini file to desired one. -This affects many parts in rhodecode including commiters names, filenames, +This affects many parts in rhodecode including committers names, filenames, encoding of commit messages. In addition RhodeCode can detect if `chardet` library is installed. If `chardet` is detected RhodeCode will fallback to it when there are encode/decode errors. diff --git a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po @@ -3730,7 +3730,7 @@ msgid "Last modified" msgstr "" #: rhodecode/templates/files/files_browser.html:52 -msgid "Last commiter" +msgid "Last committer" msgstr "" #: rhodecode/templates/files/files_edit.html:19 diff --git a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po @@ -3869,7 +3869,7 @@ msgid "Last modified" msgstr "Dernière modification" #: rhodecode/templates/files/files_browser.html:52 -msgid "Last commiter" +msgid "Last committer" msgstr "Dernier commiteur" #: rhodecode/templates/files/files_edit.html:19 diff --git a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po @@ -3743,7 +3743,7 @@ msgid "Last modified" msgstr "最終更新日" #: rhodecode/templates/files/files_browser.html:52 -msgid "Last commiter" +msgid "Last committer" msgstr "最後の作成者" #: rhodecode/templates/files/files_edit.html:19 diff --git a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po @@ -3836,7 +3836,7 @@ msgid "Last modified" msgstr "Ostatnio modyfikowany" #: rhodecode/templates/files/files_browser.html:52 -msgid "Last commiter" +msgid "Last committer" msgstr "Autor" #: rhodecode/templates/files/files_edit.html:19 diff --git a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po @@ -3910,7 +3910,7 @@ msgid "Last modified" msgstr "Última alteração" #: rhodecode/templates/files/files_browser.html:52 -msgid "Last commiter" +msgid "Last committer" msgstr "Último commiter" #: rhodecode/templates/files/files_edit.html:19 diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot --- a/rhodecode/i18n/rhodecode.pot +++ b/rhodecode/i18n/rhodecode.pot @@ -3680,7 +3680,7 @@ msgid "Last modified" msgstr "" #: rhodecode/templates/files/files_browser.html:52 -msgid "Last commiter" +msgid "Last committer" msgstr "" #: rhodecode/templates/files/files_edit.html:19 diff --git a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po @@ -3733,7 +3733,7 @@ msgid "Last modified" msgstr "最后修改于" #: rhodecode/templates/files/files_browser.html:52 -msgid "Last commiter" +msgid "Last committer" msgstr "最后提交者" #: rhodecode/templates/files/files_edit.html:19 diff --git a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po @@ -3860,7 +3860,7 @@ msgid "Last modified" msgstr "最後修改" #: rhodecode/templates/files/files_browser.html:52 -msgid "Last commiter" +msgid "Last committer" msgstr "最後的遞交者" #: rhodecode/templates/files/files_edit.html:19 diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py --- a/rhodecode/lib/vcs/backends/base.py +++ b/rhodecode/lib/vcs/backends/base.py @@ -454,28 +454,28 @@ class BaseChangeset(object): raise NotImplementedError @LazyProperty - def commiter(self): + def committer(self): """ - Returns Commiter for given commit + Returns Committer for given commit """ raise NotImplementedError @LazyProperty - def commiter_name(self): + def committer_name(self): """ Returns Author name for given commit """ - return author_name(self.commiter) + return author_name(self.committer) @LazyProperty - def commiter_email(self): + def committer_email(self): """ Returns Author email address for given commit """ - return author_email(self.commiter) + return author_email(self.committer) @LazyProperty def author(self): diff --git a/rhodecode/lib/vcs/backends/git/changeset.py b/rhodecode/lib/vcs/backends/git/changeset.py --- a/rhodecode/lib/vcs/backends/git/changeset.py +++ b/rhodecode/lib/vcs/backends/git/changeset.py @@ -41,7 +41,7 @@ class GitChangeset(BaseChangeset): self._commit = commit self._tree_id = commit.tree - self._commiter_property = 'committer' + self._committer_property = 'committer' self._author_property = 'author' self._date_property = 'commit_time' self._date_tz_property = 'commit_timezone' @@ -53,8 +53,8 @@ class GitChangeset(BaseChangeset): self._paths = {} @LazyProperty - def commiter(self): - return safe_unicode(getattr(self._commit, self._commiter_property)) + def committer(self): + return safe_unicode(getattr(self._commit, self._committer_property)) @LazyProperty def author(self): diff --git a/rhodecode/lib/vcs/backends/hg/changeset.py b/rhodecode/lib/vcs/backends/hg/changeset.py --- a/rhodecode/lib/vcs/backends/hg/changeset.py +++ b/rhodecode/lib/vcs/backends/hg/changeset.py @@ -44,7 +44,7 @@ class MercurialChangeset(BaseChangeset): return safe_unicode(self._ctx.description()) @LazyProperty - def commiter(self): + def committer(self): return safe_unicode(self.author) @LazyProperty diff --git a/rhodecode/templates/files/files_browser.html b/rhodecode/templates/files/files_browser.html --- a/rhodecode/templates/files/files_browser.html +++ b/rhodecode/templates/files/files_browser.html @@ -49,7 +49,7 @@ ${_('Mimetype')} ${_('Last Revision')} ${_('Last modified')} - ${_('Last commiter')} + ${_('Last committer')}