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
b61df7e7
Commit
b61df7e7
authored
Jul 12, 2012
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update translations on reset
parent
beed675b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
weblate/trans/models.py
weblate/trans/models.py
+5
-1
No files found.
weblate/trans/models.py
View file @
b61df7e7
...
@@ -521,7 +521,6 @@ class SubProject(models.Model):
...
@@ -521,7 +521,6 @@ class SubProject(models.Model):
try
:
try
:
logger
.
info
(
'reseting to remote repo %s'
,
self
.
__unicode__
())
logger
.
info
(
'reseting to remote repo %s'
,
self
.
__unicode__
())
gitrepo
.
git
.
reset
(
'--hard'
,
'origin/%s'
%
self
.
branch
)
gitrepo
.
git
.
reset
(
'--hard'
,
'origin/%s'
%
self
.
branch
)
return
True
except
Exception
,
e
:
except
Exception
,
e
:
logger
.
warning
(
'failed reset on repo %s'
,
self
.
__unicode__
())
logger
.
warning
(
'failed reset on repo %s'
,
self
.
__unicode__
())
msg
=
'Error:
\
n
%s'
%
str
(
e
)
msg
=
'Error:
\
n
%s'
%
str
(
e
)
...
@@ -533,6 +532,11 @@ class SubProject(models.Model):
...
@@ -533,6 +532,11 @@ class SubProject(models.Model):
messages
.
error
(
request
,
_
(
'Failed to reset to remote branch on %s.'
)
%
self
.
__unicode__
())
messages
.
error
(
request
,
_
(
'Failed to reset to remote branch on %s.'
)
%
self
.
__unicode__
())
return
False
return
False
# create translation objects for all files
self
.
create_translations
()
return
True
def
get_linked_childs
(
self
):
def
get_linked_childs
(
self
):
'''
'''
Returns list of subprojects which link repository to us.
Returns list of subprojects which link repository to us.
...
...
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