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
7678ea3a
Commit
7678ea3a
authored
Dec 08, 2014
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix permission names to not mention git
Signed-off-by:
Michal Čihař
<
michal@cihar.com
>
parent
ec8bebf1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
17 deletions
+17
-17
README.rst
README.rst
+1
-1
docs/admin/auth.rst
docs/admin/auth.rst
+6
-6
weblate/trans/models/subproject.py
weblate/trans/models/subproject.py
+7
-7
weblate/trans/models/translation.py
weblate/trans/models/translation.py
+3
-3
No files found.
README.rst
View file @
7678ea3a
...
...
@@ -37,7 +37,7 @@ Features
* Easy web based translation
* Propagation of translations across components (eg. branches) within projects
* Tight
git
integration - every change is represented by version control commit
* Tight
VCS
integration - every change is represented by version control commit
* Usage of Django's admin interface
* Upload and automatic merging of po files
* Links to source files for context
...
...
docs/admin/auth.rst
View file @
7678ea3a
...
...
@@ -121,7 +121,7 @@ logged in users.
Basically `Users` are meant as regular translators and `Managers` for
developers who need more control over the translation - they can force
committing changes to
git
, push changes upstream (if Weblate is configured to do
committing changes to
VCS
, push changes upstream (if Weblate is configured to do
so) or disable translation (eg. when there are some major changes happening
upstream).
...
...
@@ -148,19 +148,19 @@ Can define author of translation upload [Managers]
Allows to define custom authorship when uploading translation file.
Can force committing of translation [Managers]
Can force VCS commit in the web interface.
Can see
git
repository URL [Users, Managers, Guests]
Can see
VCS
repository URL [Users, Managers, Guests]
Can see VCS repository URL inside Weblate
Can update translation from
git
[Managers]
Can update translation from
VCS
[Managers]
Can force VCS pull in the web interface.
Can push translations to remote
git
[Managers]
Can push translations to remote
VCS
[Managers]
Can force VCS push in the web interface.
Can do automatic translation using other project strings [Managers]
Can do automatic translation based on strings from other components
Can lock whole translation project [Managers]
Can lock translation for updates, useful while doing some major changes
in the project.
Can reset translations to match remote
git
[Managers]
Can reset VCS repository to match remote
git
.
Can reset translations to match remote
VCS
[Managers]
Can reset VCS repository to match remote
VCS
.
Can save translation [Users, Managers]
Can save translation (might be disabled with :ref:`voting`).
Can accept suggestion [Users, Managers]
...
...
weblate/trans/models/subproject.py
View file @
7678ea3a
...
...
@@ -336,7 +336,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
)
permissions
=
(
(
'lock_subproject'
,
"Can lock translation for translating"
),
(
'can_see_git_repository'
,
"Can see
git
repository URL"
),
(
'can_see_git_repository'
,
"Can see
VCS
repository URL"
),
)
app_label
=
'trans'
...
...
@@ -408,7 +408,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
def
_get_path
(
self
):
'''
Returns full path to subproject
git
repository.
Returns full path to subproject
VCS
repository.
'''
if
self
.
is_repo_link
:
return
self
.
linked_subproject
.
get_path
()
...
...
@@ -521,7 +521,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
def
get_export_url
(
self
):
'''
Returns URL of exported
git
repository.
Returns URL of exported
VCS
repository.
'''
if
self
.
is_repo_link
:
return
self
.
linked_subproject
.
git_export
...
...
@@ -819,7 +819,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
def
create_translations
(
self
,
force
=
False
,
langs
=
None
,
request
=
None
):
'''
Loads translations from
git
.
Loads translations from
VCS
.
'''
translations
=
[]
matches
=
self
.
get_mask_matches
()
...
...
@@ -878,7 +878,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
def
sync_git_repo
(
self
,
validate
=
False
):
'''
Brings
git
repo in sync with current model.
Brings
VCS
repo in sync with current model.
'''
if
self
.
is_repo_link
:
return
...
...
@@ -1088,7 +1088,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
_
(
'Unsupported file format: {0}'
).
format
(
self
.
file_format
)
)
# Validate
git
repo
# Validate
VCS
repo
try
:
self
.
sync_git_repo
(
True
)
except
RepositoryException
as
exc
:
...
...
@@ -1136,7 +1136,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
Save wrapper which updates backend repository and regenerates
translation data.
'''
# Detect if
git
config has changed (so that we have to pull the repo)
# Detect if
VCS
config has changed (so that we have to pull the repo)
changed_git
=
True
if
self
.
id
:
old
=
SubProject
.
objects
.
get
(
pk
=
self
.
id
)
...
...
weblate/trans/models/translation.py
View file @
7678ea3a
...
...
@@ -152,9 +152,9 @@ class Translation(models.Model, URLMixin, PercentMixin, LoggerMixin):
(
'overwrite_translation'
,
"Can overwrite with translation upload"
),
(
'author_translation'
,
"Can define author of translation upload"
),
(
'commit_translation'
,
"Can force commiting of translation"
),
(
'update_translation'
,
"Can update translation from"
),
(
'push_translation'
,
"Can push translations to remote"
),
(
'reset_translation'
,
"Can reset translations to match remote"
),
(
'update_translation'
,
"Can update translation from
VCS
"
),
(
'push_translation'
,
"Can push translations to remote
VCS
"
),
(
'reset_translation'
,
"Can reset translations to match remote
VCS
"
),
(
'automatic_translation'
,
"Can do automatic translation"
),
(
'lock_translation'
,
"Can lock whole translation project"
),
(
'use_mt'
,
"Can use machine translation"
),
...
...
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