Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gettext #215

Merged
merged 4 commits into from
Jun 22, 2019
Merged

Gettext #215

merged 4 commits into from
Jun 22, 2019

Conversation

yetist
Copy link
Member

@yetist yetist commented May 16, 2019

No description provided.

@raveit65
Copy link
Member

If you don't want to merge meson PRs, e.g. mozo,
it doesn't makes sense to merge/review gettext PRs for me, because make dist is broken with gettext.
And i need this for releasing developer releases.

@yetist
Copy link
Member Author

yetist commented May 16, 2019

If you don't want to merge meson PRs, e.g. mozo,
it doesn't makes sense to merge/review gettext PRs for me, because make dist is broken with gettext.
And i need this for releasing developer releases.

Mozo is different, it use new feature of meson-0.50.0, but the current version is 0.49.2 on debian/ubuntu, so it can't build and create tarball on debian/ubuntu, but can create tarball on archlinux/fedora for release, it's enough. After user get the tarball, they can use autotools to install/uninstall.

The other repos may not need the new feature of meson, for example mate-backgrounds use meson-0.41.0.

Copy link
Contributor

@rbuj rbuj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. It seems that it didn't lose any message.

$ ./autogen.sh --prefix=/usr && ./makepot
$ grep "\.ui" mate-session-manager.pot | wc -l
16
$ git diff --stat mate-session-manager.pot
...
 1 file changed, 168 insertions(+), 136 deletions(-)
$ make distcheck
...
=============================================================
mate-session-manager-1.23.0 archives ready for distribution: 
mate-session-manager-1.23.0.tar.xz
=============================================================

@lukefromdc lukefromdc self-requested a review May 27, 2019 05:43
Copy link
Member

@lukefromdc lukefromdc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can confirm mate-distcheck completes fine on Debian Unstable with this:

=============================================================
mate-session-manager-1.23.0 archives ready for distribution: 
mate-session-manager-1.23.0.tar.xz
=============================================================
luke@ubuntu:~/Desktop/mate-session-manager$ 

Did not test installing for a new session as this does not appear to change the built binaries and I would have to log back into github et all to report the results. I did check the mate-session-properties(startup applications) desktop file for function and it worked fine

@lukefromdc lukefromdc requested a review from a team May 27, 2019 05:44
@lukefromdc
Copy link
Member

We've already merged meson PR's for mate-desktop and mozo, so we need these now

@raveit65
Copy link
Member

raveit65 commented May 27, 2019

Please check tarballs!
make distcheck creates .gmo and .po files in tarball.
That means we ship broken tarballs when this is merged.
The solution is to port to meson and using ninja -C build dist to create a tarball.
I suggest finishing this 2 ports for every repo before start porting to gettext in every repo,
and make distcheck is broken everywhere.

PS: marco is ported to gettext but meson port is missing.

Edit: see here for references mate-desktop/mate-backgrounds#22 (comment)

Copy link
Member

@raveit65 raveit65 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM and it builds fine.
see my previous comment about problem with generated tarball.

@lukefromdc
Copy link
Member

I don't know enough about .gmo and .po files to make a valid check, unless we just want absence or presence of either one. I just checked to see that make-distcheck completed, then asked for other reviews.

I agree with this and meson ports being one after the other given the issue with tarballs.

@yetist
Copy link
Member Author

yetist commented Jun 22, 2019

Fix make dist to remove gmo files, result is here:
https://travis-ci.org/mate-desktop/mate-session-manager/jobs/549059011#L2214

@raveit65
Copy link
Member

Thanks again for this fix. Now we can merge this.

@raveit65 raveit65 merged commit 891f9d9 into master Jun 22, 2019
@raveit65 raveit65 deleted the gettext branch June 22, 2019 12:15
@raveit65
Copy link
Member

@yetist
sorry, for asking you again, but we have 3 desktop files here which contain icon and keyword entry.
Can you add translators hints please?

@raveit65
Copy link
Member

@yetist
Done, please review and merge.
#225

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants