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
d7d1eb30
Commit
d7d1eb30
authored
Mar 13, 2012
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check permissions for overwriting translations
parent
3d00649b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
trans/forms.py
trans/forms.py
+3
-1
trans/views.py
trans/views.py
+9
-3
No files found.
trans/forms.py
View file @
d7d1eb30
...
...
@@ -75,8 +75,10 @@ class TranslationForm(forms.Form):
target
=
PluralField
(
required
=
False
)
fuzzy
=
forms
.
BooleanField
(
label
=
_
(
'Fuzzy'
),
required
=
False
)
class
UploadForm
(
forms
.
Form
):
class
Simple
UploadForm
(
forms
.
Form
):
file
=
forms
.
FileField
(
label
=
_
(
'File'
))
class
UploadForm
(
SimpleUploadForm
):
overwrite
=
forms
.
BooleanField
(
label
=
_
(
'Overwrite existing translations'
),
required
=
False
)
class
SearchForm
(
forms
.
Form
):
...
...
trans/views.py
View file @
d7d1eb30
...
...
@@ -12,7 +12,7 @@ from django.views.decorators.csrf import csrf_exempt
from
trans.models
import
Project
,
SubProject
,
Translation
,
Unit
,
Suggestion
,
Check
from
lang.models
import
Language
from
trans.forms
import
TranslationForm
,
UploadForm
,
SearchForm
from
trans.forms
import
TranslationForm
,
UploadForm
,
S
impleUploadForm
,
S
earchForm
from
util
import
is_plural
,
split_plural
,
join_plural
from
accounts.models
import
Profile
import
logging
...
...
@@ -76,7 +76,10 @@ def show_subproject(request, project, subproject):
def
show_translation
(
request
,
project
,
subproject
,
lang
):
obj
=
get_object_or_404
(
Translation
,
language__code
=
lang
,
subproject__slug
=
subproject
,
subproject__project__slug
=
project
)
form
=
UploadForm
()
if
request
.
user
.
has_perm
(
'trans.overwrite_translation'
):
form
=
UploadForm
()
else
:
form
=
SimpleUploadForm
()
search_form
=
SearchForm
()
return
render_to_response
(
'translation.html'
,
RequestContext
(
request
,
{
...
...
@@ -394,7 +397,10 @@ def upload_translation(request, project, subproject, lang):
obj
=
get_object_or_404
(
Translation
,
language__code
=
lang
,
subproject__slug
=
subproject
,
subproject__project__slug
=
project
)
if
request
.
method
==
'POST'
:
form
=
UploadForm
(
request
.
POST
,
request
.
FILES
)
if
request
.
user
.
has_perm
(
'trans.overwrite_translation'
):
form
=
UploadForm
(
request
.
POST
,
request
.
FILES
)
else
:
form
=
SimpleUploadForm
(
request
.
POST
,
request
.
FILES
)
if
form
.
is_valid
():
try
:
ret
=
obj
.
merge_upload
(
request
,
request
.
FILES
[
'file'
],
form
.
cleaned_data
[
'overwrite'
])
...
...
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