Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
caf13715
Commit
caf13715
authored
May 05, 2013
by
Chris Oelmueller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some more typos
parent
cf219281
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
20 deletions
+20
-20
docs/admin.rst
docs/admin.rst
+2
-2
docs/management.rst
docs/management.rst
+2
-2
trans/models/project.py
trans/models/project.py
+1
-1
trans/models/subproject.py
trans/models/subproject.py
+1
-1
trans/models/translation.py
trans/models/translation.py
+2
-2
trans/tests/git_views.py
trans/tests/git_views.py
+11
-11
weblate/html/js/git-status.html
weblate/html/js/git-status.html
+1
-1
No files found.
docs/admin.rst
View file @
caf13715
...
...
@@ -238,7 +238,7 @@ Pre commit processing of translations
-------------------------------------
In many cases you might want to automatically do some changes to translation
before it is commited to the repository. The pre commit script is exactly the
before it is commit
t
ed to the repository. The pre commit script is exactly the
place to achieve this.
Before using any scripts, you need to list them in
...
...
@@ -421,7 +421,7 @@ Machine translation setup
-------------------------
Weblate has builtin support for several machine translation services and it's
up to adminitrator to enable them. The services have different terms of use, so
up to admini
s
trator to enable them. The services have different terms of use, so
please check whether you are allowed to use them before enabling in Weblate.
The individual services are enabled using :setting:`MACHINE_TRANSLATION_SERVICES`.
...
...
docs/management.rst
View file @
caf13715
...
...
@@ -106,7 +106,7 @@ pushgit <project|project/subproject>
.. django-admin:: pushgit
Pushes commit
ed changes to upstream Git repository. With ``--force-commit``
Pushes commit
ted changes to upstream Git repository. With ``--force-commit``
it also commits any pending changes.
You can either define which project or subproject to update (eg.
...
...
@@ -157,7 +157,7 @@ setuplang
Setups list of languages (it has own list and all defined in
translate-toolkit).
The option ``--no-update`` disables update of existing languages (only add
The option ``--no-update`` disables update of existing languages (only add
s
new ones).
updatechecks <project|project/subproject>
...
...
trans/models/project.py
View file @
caf13715
...
...
@@ -321,7 +321,7 @@ class Project(models.Model, PercentMixin, URLMixin):
def
git_needs_commit
(
self
):
'''
Checks whether there are some not commited changes.
Checks whether there are some not commit
t
ed changes.
'''
for
resource
in
self
.
subproject_set
.
all
():
if
resource
.
git_needs_commit
():
...
...
trans/models/subproject.py
View file @
caf13715
...
...
@@ -889,7 +889,7 @@ class SubProject(models.Model, PercentMixin, URLMixin):
def
git_needs_commit
(
self
):
'''
Checks whether there are some not commited changes.
Checks whether there are some not commit
t
ed changes.
'''
status
=
self
.
git_repo
.
git
.
status
(
'--porcelain'
)
if
status
==
''
:
...
...
trans/models/translation.py
View file @
caf13715
...
...
@@ -711,7 +711,7 @@ class Translation(models.Model, URLMixin):
def
__configure_git
(
self
,
gitrepo
,
section
,
key
,
expected
):
'''
Adj
y
sts git config to ensure that section.key is set to expected.
Adj
u
sts git config to ensure that section.key is set to expected.
'''
cnf
=
gitrepo
.
config_writer
()
try
:
...
...
@@ -792,7 +792,7 @@ class Translation(models.Model, URLMixin):
def
git_needs_commit
(
self
):
'''
Checks whether there are some not commited changes.
Checks whether there are some not commit
t
ed changes.
'''
status
=
self
.
git_repo
.
git
.
status
(
'--porcelain'
,
'--'
,
self
.
filename
)
if
status
==
''
:
...
...
trans/tests/git_views.py
View file @
caf13715
...
...
@@ -96,10 +96,10 @@ class GitNoChangeTranslationTest(GitNoChangeProjectTest):
class
GitChangeProjectTest
(
GitNoChangeProjectTest
):
'''
Testing of project git manipulations with not commited change in repo.
Testing of project git manipulations with not commit
t
ed change in repo.
'''
STATUS_CHECK
=
'There are some not commited changes!'
STATUS_CHECK
=
'There are some not commit
t
ed changes!'
def
setUp
(
self
):
super
(
GitChangeProjectTest
,
self
).
setUp
()
...
...
@@ -108,40 +108,40 @@ class GitChangeProjectTest(GitNoChangeProjectTest):
class
GitChangeSubProjectTest
(
GitChangeProjectTest
):
'''
Testing of subproject git manipulations with not commited change in repo.
Testing of subproject git manipulations with not commit
t
ed change in repo.
'''
TEST_TYPE
=
'subproject'
class
GitChangeTranslationTest
(
GitChangeProjectTest
):
'''
Testing of translation git manipulations with not commited change in repo.
Testing of translation git manipulations with not commit
t
ed change in repo.
'''
TEST_TYPE
=
'translation'
class
GitCommitedChangeProjectTest
(
GitNoChangeProjectTest
):
class
GitCommit
t
edChangeProjectTest
(
GitNoChangeProjectTest
):
'''
Testing of project git manipulations with commited change in repo.
Testing of project git manipulations with commit
t
ed change in repo.
'''
STATUS_CHECK
=
'There are some new commits in local Git repository!'
def
setUp
(
self
):
super
(
GitCommitedChangeProjectTest
,
self
).
setUp
()
super
(
GitCommit
t
edChangeProjectTest
,
self
).
setUp
()
self
.
change_unit
(
u'Ahoj světe!
\
n
'
)
self
.
project
.
commit_pending
(
self
.
get_request
(
'/'
))
class
GitCommit
edChangeSubProjectTest
(
GitCommi
tedChangeProjectTest
):
class
GitCommit
tedChangeSubProjectTest
(
GitCommit
tedChangeProjectTest
):
'''
Testing of subproject git manipulations with commited change in repo.
Testing of subproject git manipulations with commit
t
ed change in repo.
'''
TEST_TYPE
=
'subproject'
class
GitCommit
edChangeTranslationTest
(
GitCommi
tedChangeProjectTest
):
class
GitCommit
tedChangeTranslationTest
(
GitCommit
tedChangeProjectTest
):
'''
Testing of translation git manipulations with commited change in repo.
Testing of translation git manipulations with commit
t
ed change in repo.
'''
TEST_TYPE
=
'translation'
weblate/html/js/git-status.html
View file @
caf13715
...
...
@@ -21,7 +21,7 @@
</ul>
{% if needs_commit %}
<p>
{% trans "There are some not commited changes!" %}
</p>
<p>
{% trans "There are some not commit
t
ed changes!" %}
</p>
{% endif %}
{% if object.git_needs_merge %}
<p>
{% trans "Remote Git repository needs to be merged!" %}
</p>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment