5:52 a.m.
We've migrated to using WebLate a week or so ago and we've been facing
some issues related to merge conflicts, probably due to some
misconfiguration on our side, which we'd need some help to solve.
Firstly, we're receiving MRs on our GitLab directly changing po/*po
files. is that expected?
If so, what would be the best way to:
1) Avoid things like
https://translate.stg.fedoraproject.org/projects/libosinfo/libosinfo/#ale...
2) If we fail to avoid such, what would be the best way to have them
solved without actually doing a merge? libosinfo projects do *not* use
merge, just rebase is used.
Last but not least, I've failed to understand what's the best way to
use `wlc` command line tool. `wlc lock` just returns me "Error: No
object passed on command line!". But what shall I pass? `wlc lock
--help` tells me that: "object Object on which we should operate
(project, component or translation)". `wlc lock $project_name` just
returns me a bunch of errors like:
```
fidencio@laerte ~/src/upstream/libosinfo $ wlc lock libosinfo
Traceback (most recent call last):
File "/usr/lib/python3.7/site-packages/urllib3/connection.py", line
157, in _new_conn
(self._dns_host, self.port), self.timeout, **extra_kw
File "/usr/lib/python3.7/site-packages/urllib3/util/connection.py",
line 84, in create_connection
raise err
File "/usr/lib/python3.7/site-packages/urllib3/util/connection.py",
line 74, in create_connection
sock.connect(sa)
ConnectionRefusedError: [Errno 111] Connection refused
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/usr/lib/python3.7/site-packages/urllib3/connectionpool.py",
line 672, in urlopen
chunked=chunked,
File "/usr/lib/python3.7/site-packages/urllib3/connectionpool.py",
line 387, in _make_request
conn.request(method, url, **httplib_request_kw)
File "/usr/lib64/python3.7/http/client.py", line 1252, in request
self._send_request(method, url, body, headers, encode_chunked)
File "/usr/lib64/python3.7/http/client.py", line 1298, in _send_request
self.endheaders(body, encode_chunked=encode_chunked)
File "/usr/lib64/python3.7/http/client.py", line 1247, in endheaders
self._send_output(message_body, encode_chunked=encode_chunked)
File "/usr/lib64/python3.7/http/client.py", line 1026, in _send_output
self.send(msg)
File "/usr/lib64/python3.7/http/client.py", line 966, in send
self.connect()
File "/usr/lib/python3.7/site-packages/urllib3/connection.py", line
184, in connect
conn = self._new_conn()
File "/usr/lib/python3.7/site-packages/urllib3/connection.py", line
169, in _new_conn
self, "Failed to establish a new connection: %s" % e
urllib3.exceptions.NewConnectionError:
<urllib3.connection.HTTPConnection object at 0x7fe76b9e5610>: Failed
to establish a new connection: [Errno 111] Connection refused
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/usr/lib/python3.7/site-packages/requests/adapters.py", line
449, in send
timeout=timeout
File "/usr/lib/python3.7/site-packages/urllib3/connectionpool.py",
line 720, in urlopen
method, url, error=e, _pool=self, _stacktrace=sys.exc_info()[2]
File "/usr/lib/python3.7/site-packages/urllib3/util/retry.py", line
436, in increment
raise MaxRetryError(_pool, url, error or ResponseError(cause))
urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1',
port=8000): Max retries exceeded with url: /api/projects/libosinfo/
(Caused by NewConnectionError('<urllib3.connection.HTTPConnection
object at 0x7fe76b9e5610>: Failed to establish a new connection:
[Errno 111] Connection refused'))
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/usr/local/bin/wlc", line 10, in <module>
sys.exit(main())
File "/usr/local/lib/python3.7/site-packages/wlc/main.py", line 703, in main
command.run()
File "/usr/local/lib/python3.7/site-packages/wlc/main.py", line 567, in run
obj = self.get_object()
File "/usr/local/lib/python3.7/site-packages/wlc/main.py", line 280,
in get_object
obj = super(ComponentCommand, self).get_object()
File "/usr/local/lib/python3.7/site-packages/wlc/main.py", line 262,
in get_object
return self.wlc.get_object(path)
File "/usr/local/lib/python3.7/site-packages/wlc/__init__.py", line
145, in get_object
return self.get_project(path)
File "/usr/local/lib/python3.7/site-packages/wlc/__init__.py", line
150, in get_project
return self._get_factory("projects", path, Project)
File "/usr/local/lib/python3.7/site-packages/wlc/__init__.py", line
131, in _get_factory
data = self.get("/".join((prefix, path, "")))
File "/usr/local/lib/python3.7/site-packages/wlc/__init__.py", line
118, in get
return self.request("get", path)
File "/usr/local/lib/python3.7/site-packages/wlc/__init__.py", line
82, in request
r = self.invoke_request(method, path, params, files)
File "/usr/local/lib/python3.7/site-packages/wlc/__init__.py", line
104, in invoke_request
files=files,
File "/usr/lib/python3.7/site-packages/requests/api.py", line 60, in request
return session.request(method=method, url=url, **kwargs)
File "/usr/lib/python3.7/site-packages/requests/sessions.py", line
533, in request
resp = self.send(prep, **send_kwargs)
File "/usr/lib/python3.7/site-packages/requests/sessions.py", line
646, in send
r = adapter.send(request, **kwargs)
File "/usr/lib/python3.7/site-packages/requests/adapters.py", line
516, in send
raise ConnectionError(e, request=request)
requests.exceptions.ConnectionError:
HTTPConnectionPool(host='127.0.0.1', port=8000): Max retries exceeded
with url: /api/projects/libosinfo/ (Caused by
NewConnectionError('<urllib3.connection.HTTPConnection object at
0x7fe76b9e5610>: Failed to establish a new connection: [Errno 111]
Connection refused'))
```
So, I've been using the WebUI but would be nice to understand the
workflow of the CLI tool.
Best Regards,
--
Fabiano Fidêncio
6:17 a.m.
Hi,
Le 2020-01-16 12:52, Fabiano Fidêncio a écrit :
Firstly, we're receiving MRs on our GitLab directly changing
po/*po
files. is that expected?
Yes, your component uses the plugin "Update PO files to match POT
(msgmerge)"
https://docs.weblate.org/en/weblate-3.10.1/admin/addons.html#update-po-fi...
This will update automatically all po files, allowing translators to see
missing translations without having you to care about updating all
files.
If so, what would be the best way to:
1) Avoid things like
https://translate.stg.fedoraproject.org/projects/libosinfo/libosinfo/#ale...
Here you have the Polish file in conflicts. It probably means it was
edited in both git repositories.
To solve it:
* as it's only one file, upload it manually in Weblate and set the real
contributor name
* or use command line:
https://docs.weblate.org/en/weblate-3.10.1/faq.html#how-to-fix-merge-conf...
To prevent it:
The easiest for you and translators is to only use Weblate. Anyone can
do imports. For every languages.
You'll have no integration work and translators will be able to see
changes.
The more complex is to use the wlc command line tool to lock, pull and
merge changes.
But honestly, it's a bad idea as it brings manual operations and hide
the change for Weblate users.
Last but not least, I've failed to understand what's the best
way to
use `wlc` command line tool. `wlc lock` just returns me "Error: No
object passed on command line!". But what shall I pass? `wlc lock
--help` tells me that: "object Object on which we should operate
(project, component or translation)". `wlc lock $project_name` just
You are using wlc to lock a project, but documentation tells it is to
lock a component:
https://docs.weblate.org/en/weblate-3.10.1/wlc.html#cmdoption-wlc-arg-lock
Try with `wlc lock libosinfo/libosinfo`
In Weblate, the project is a group of components, and only the component
contains the git repository (or reuse an existing one, if so, you'll see
it marked as linked).
Jean-Baptiste
6:26 a.m.
On Thu, Jan 16, 2020 at 01:17:18PM +0100, Jean-Baptiste Holcroft wrote:
Hi,
Le 2020-01-16 12:52, Fabiano Fidêncio a écrit :
> Firstly, we're receiving MRs on our GitLab directly changing po/*po
> files. is that expected?
Yes, your component uses the plugin "Update PO files to match POT
(msgmerge)"
https://docs.weblate.org/en/weblate-3.10.1/admin/addons.html#update-po-fi...
This will update automatically all po files, allowing translators to see
missing translations without having you to care about updating all files.
> If so, what would be the best way to:
> 1) Avoid things like
> https://translate.stg.fedoraproject.org/projects/libosinfo/libosinfo/#ale...
Here you have the Polish file in conflicts. It probably means it was edited
in both git repositories.
I don't believe that's the case here if I look at the git commit history
In the main upstream libosinfo.git repo we have this commit:
commit 3d6422ced93c3f7797300bd8476a5ca9ab492217
Author: Piotr Drąg <piotrdrag(a)gmail.com>
AuthorDate: Sat Jan 11 11:03:47 2020 +0000
Commit: Fabiano Fidêncio <fidencio(a)redhat.com>
CommitDate: Mon Jan 13 08:22:15 2020 +0100
Translated using Weblate (Polish)
Currently translated at 100.0% (168 of 168 strings)
Translation: libosinfo/libosinfo
Translate-URL:
https://translate.stg.fedoraproject.org/projects/libosinfo/libosinfo/pl/
Signed-off-by: Piotr Drąg <piotrdrag(a)gmail.com>
This was from a Weblate merge request merged on Monday:
https://gitlab.com/libosinfo/libosinfo/merge_requests/43
If we look at the Weblate git repo though, the commit was
updated by the translator again on Wednesday, *after* the
weblate merge request was already accepted:
commit 17e6dde789283689a36dafe2bd9c453d671b6ec3
Author: Piotr Drąg <piotrdrag(a)gmail.com>
Date: Wed Jan 15 15:25:28 2020 +0000
Translated using Weblate (Polish)
Currently translated at 100.0% (168 of 168 strings)
Translation: libosinfo/libosinfo
Translate-URL:
https://translate.stg.fedoraproject.org/projects/libosinfo/libosinfo/pl/
Signed-off-by: Piotr Drąg <piotrdrag(a)gmail.com>
So AFAICT, the cause of the conflict is weblate itself.
It should never have amended the existing commit because it
had already been accepted via the merge request 2 days earlier.
For some reason weblate did not see that the merge request was
accepted and so did not refresh its view of the upstream repo,
allowing the translator to continue working on outdated content
ultimately resulting in this conflict.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
3:25 a.m.
On Thu, Jan 16, 2020 at 1:26 PM Daniel P. Berrangé <berrange(a)redhat.com> wrote:
On Thu, Jan 16, 2020 at 01:17:18PM +0100, Jean-Baptiste Holcroft wrote:
> Hi,
>
> Le 2020-01-16 12:52, Fabiano Fidêncio a écrit :
> > Firstly, we're receiving MRs on our GitLab directly changing po/*po
> > files. is that expected?
>
> Yes, your component uses the plugin "Update PO files to match POT
> (msgmerge)"
>
https://docs.weblate.org/en/weblate-3.10.1/admin/addons.html#update-po-fi...
>
> This will update automatically all po files, allowing translators to see
> missing translations without having you to care about updating all files.
>
> > If so, what would be the best way to:
> > 1) Avoid things like
> > https://translate.stg.fedoraproject.org/projects/libosinfo/libosinfo/#ale...
>
> Here you have the Polish file in conflicts. It probably means it was edited
> in both git repositories.
I don't believe that's the case here if I look at the git commit history
In the main upstream libosinfo.git repo we have this commit:
commit 3d6422ced93c3f7797300bd8476a5ca9ab492217
Author: Piotr Drąg <piotrdrag(a)gmail.com>
AuthorDate: Sat Jan 11 11:03:47 2020 +0000
Commit: Fabiano Fidêncio <fidencio(a)redhat.com>
CommitDate: Mon Jan 13 08:22:15 2020 +0100
Translated using Weblate (Polish)
Currently translated at 100.0% (168 of 168 strings)
Translation: libosinfo/libosinfo
Translate-URL:
https://translate.stg.fedoraproject.org/projects/libosinfo/libosinfo/pl/
Signed-off-by: Piotr Drąg <piotrdrag(a)gmail.com>
This was from a Weblate merge request merged on Monday:
https://gitlab.com/libosinfo/libosinfo/merge_requests/43
If we look at the Weblate git repo though, the commit was
updated by the translator again on Wednesday, *after* the
weblate merge request was already accepted:
commit 17e6dde789283689a36dafe2bd9c453d671b6ec3
Author: Piotr Drąg <piotrdrag(a)gmail.com>
Date: Wed Jan 15 15:25:28 2020 +0000
Translated using Weblate (Polish)
Currently translated at 100.0% (168 of 168 strings)
Translation: libosinfo/libosinfo
Translate-URL:
https://translate.stg.fedoraproject.org/projects/libosinfo/libosinfo/pl/
Signed-off-by: Piotr Drąg <piotrdrag(a)gmail.com>
So AFAICT, the cause of the conflict is weblate itself.
It should never have amended the existing commit because it
had already been accepted via the merge request 2 days earlier.
For some reason weblate did not see that the merge request was
accepted and so did not refresh its view of the upstream repo,
allowing the translator to continue working on outdated content
ultimately resulting in this conflict.
For now, libosinfo repo is locked. Jean-Baptiste, would you mind
giving me some hands-on help on solving this?
We could do this via IRC, or any other communication platform.
Also, osinfo-db-tools will face similar issues because, for some
reason I don't understand (as everything seems to be correctly set-up)
may be in a similar state if I decide to close this MR[0] and just
push the changes to master adding my own SoB tag.
[0]: https://gitlab.com/libosinfo/osinfo-db-tools/merge_requests/21
Best Regards,
--
Fabiano Fidêncio
6:30 a.m.
[snip]
> Last but not least, I've failed to understand what's the best way to
> use `wlc` command line tool. `wlc lock` just returns me "Error: No
> object passed on command line!". But what shall I pass? `wlc lock
> --help` tells me that: "object Object on which we should operate
> (project, component or translation)". `wlc lock $project_name` just
You are using wlc to lock a project, but documentation tells it is to
lock a component:
https://docs.weblate.org/en/weblate-3.10.1/wlc.html#cmdoption-wlc-arg-lock
Try with `wlc lock libosinfo/libosinfo`
Very same error. Am I missing some config file? Shall I have a valid
krb ticket for fedoraproject.org?
Best Regards,
--
Fabiano Fidêncio
6:33 a.m.
On Thu, Jan 16, 2020 at 01:30:45PM +0100, Fabiano Fidêncio wrote:
[snip]
>
> > Last but not least, I've failed to understand what's the best way to
> > use `wlc` command line tool. `wlc lock` just returns me "Error: No
> > object passed on command line!". But what shall I pass? `wlc lock
> > --help` tells me that: "object Object on which we should operate
> > (project, component or translation)". `wlc lock $project_name` just
>
> You are using wlc to lock a project, but documentation tells it is to
> lock a component:
> https://docs.weblate.org/en/weblate-3.10.1/wlc.html#cmdoption-wlc-arg-lock
> Try with `wlc lock libosinfo/libosinfo`
Very same error. Am I missing some config file? Shall I have a valid
krb ticket for fedoraproject.org?
You need a weblate API key for your account
# cat $HOME/.config/weblate
[weblate]
url = https://translate.stg.fedoraproject.org/api/
key = ...key here..
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
1551
days inactive
1555
days old
5 comments
3 participants
participants (3)
-
Daniel P. Berrangé -
Fabiano Fidêncio -
Jean-Baptiste Holcroft