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

Travis CI testing #26

Closed
wants to merge 2 commits into from
Closed

Travis CI testing #26

wants to merge 2 commits into from

Conversation

daxtens
Copy link
Contributor

@daxtens daxtens commented Nov 15, 2016

Hi Sam,

This allows testing with Travis CI.

If you merge it, you will also want to turn on testing for this repository in Travis CI.

Regards,
Daniel


This change is Reviewable

This fixes things for old versions of msgmerge such as the one
used on Travis CI (Ubuntu 14.04)

Signed-off-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Daniel Axtens <dja@axtens.net>
@@ -57,7 +57,7 @@ USE_MSGCTXT = no
# Useful options are in particular:
# --previous to keep previous msgids of translated messages,
# --quiet to reduce the verbosity.
MSGMERGE_OPTIONS = --add-location=never
MSGMERGE_OPTIONS = --no-location
Copy link
Contributor

Choose a reason for hiding this comment

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

Commit 55ffff9 did the inverse of this, IIRC it was because of a difference between older and newer versions of msgmerge. It could be that adding both may work, I'll have to check.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It looks like the ability to take a parameter for add-location was only added in mid-2014, which would explain why it isn't in 14.04: https://lists.gnu.org/archive/html/bug-gettext/2014-03/msg00021.html

What is the difference between --add-location=never and --no-location? My reading of the man page was that they were identical...

@daxtens
Copy link
Contributor Author

daxtens commented Nov 18, 2016

Ignore the new commits, I was ... testing something ...

@sammj
Copy link
Contributor

sammj commented Dec 1, 2017

Merged as 865097f manually, thanks! What's that about the date? 20 something? What? I can't hear you?

@sammj sammj closed this Dec 1, 2017
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

3 participants