Jump to content


Photo

merge requests for PLi's git


  • Please log in to reply
1748 replies to this topic

Re: merge requests for PLi's git #1021 mirakels

  • Forum Moderator
    PLi® Core member
  • 7,603 posts

+62
Good

Posted 8 February 2017 - 11:28

sure, cpp files can use po. but what part of the cpp files show output that is directly shown on screen that needs to be translated?

 

As far as I know the C code is for pure lowlevel stuff and Python is for the user interface.

 

I think we do not want Chinese log messages as part of a crash description, do we?


Geen wonder... Had slechts een dm7000, maar wel ook een rotor. eigenlijk al een tijdje ook een dm600 en dm7025. Maar nu kijkend met een et9000 en vuduo

Re: merge requests for PLi's git #1022 Persian Prince

  • Senior Member
  • 1,982 posts

+247
Excellent

Posted 8 February 2017 - 19:08

Why do we need a enigma2.pot?
Normally the enigma2.pot is generated automatically from the sources
 
For translations we have a specail thread: https://forums.openp...-post-them-here

Would you please point me to a correct guide for it ? It seems I'm not the only one having problems with enigma2.pot creation.

Open Vision sources: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1023 mirakels

  • Forum Moderator
    PLi® Core member
  • 7,603 posts

+62
Good

Posted 8 February 2017 - 19:40

There should be some description in that thread....

But basically translators work with th LANGUAGE.po files (e.g. nl.po). to add the translations.

 

The only thing we should do is regularly generate new .po files that include the new strings (when strings changes happened in the enigma2 python or xml files).

However so far this is still a manual process as they must be committed

 

The enigma2.pot files is not tracked in the enigma2 git. The .po files are


Geen wonder... Had slechts een dm7000, maar wel ook een rotor. eigenlijk al een tijdje ook een dm600 en dm7025. Maar nu kijkend met een et9000 en vuduo

Re: merge requests for PLi's git #1024 Persian Prince

  • Senior Member
  • 1,982 posts

+247
Excellent

Posted 8 February 2017 - 19:45

Well that's the problem you don't generate new po files, Last po renewal was 2 years ago and you want to tell me we didn't have new strings since then ? ;)

Open Vision sources: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1025 mirakels

  • Forum Moderator
    PLi® Core member
  • 7,603 posts

+62
Good

Posted 8 February 2017 - 23:21

Yes, I plead guilty (but in my defence, no of the other people in the team did so ;)

 

This indeed is a bit of a weird thing.  We should somehow automate this so it is done regularly (or even on every change...)

 

so guess what.... I rebuild the po files and pushed them!

 

Generating them gave below warnings:

RecordTimer.py:512: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                             The translator cannot reorder the arguments.
                             Please consider using a format string with named arguments,
                             and a mapping instead of a tuple for the arguments.
lib/python/Components/DiskInfo.py:38: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                               The translator cannot reorder the arguments.
                                               Please consider using a format string with named arguments,
                                               and a mapping instead of a tuple for the arguments.
lib/python/Components/EpgList.py:291: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                               The translator cannot reorder the arguments.
                                               Please consider using a format string with named arguments,
                                               and a mapping instead of a tuple for the arguments.
lib/python/Components/Task.py:470: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                            The translator cannot reorder the arguments.
                                            Please consider using a format string with named arguments,
                                            and a mapping instead of a tuple for the arguments.
lib/python/Screens/About.py:135: warning: Empty msgid.  It is reserved by GNU gettext:
                                          gettext("") returns the header entry with
                                          meta information, not the empty string.
lib/python/Screens/AutoDiseqc.py:194: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                               The translator cannot reorder the arguments.
                                               Please consider using a format string with named arguments,
                                               and a mapping instead of a tuple for the arguments.
lib/python/Screens/AutoDiseqc.py:284: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                               The translator cannot reorder the arguments.
                                               Please consider using a format string with named arguments,
                                               and a mapping instead of a tuple for the arguments.
lib/python/Screens/ChannelSelection.py:1053: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                                      The translator cannot reorder the arguments.
                                                      Please consider using a format string with named arguments,
                                                      and a mapping instead of a tuple for the arguments.
lib/python/Screens/InfoBar.py:542: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                            The translator cannot reorder the arguments.
                                            Please consider using a format string with named arguments,
                                            and a mapping instead of a tuple for the arguments.
lib/python/Screens/Ipkg.py:58: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                        The translator cannot reorder the arguments.
                                        Please consider using a format string with named arguments,
                                        and a mapping instead of a tuple for the arguments.
lib/python/Screens/Ipkg.py:58: warning: 'msgid_plural' format string with unnamed arguments cannot be properly localized:
                                        The translator cannot reorder the arguments.
                                        Please consider using a format string with named arguments,
                                        and a mapping instead of a tuple for the arguments.
lib/python/Screens/MovieSelection.py:1927: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                                    The translator cannot reorder the arguments.
                                                    Please consider using a format string with named arguments,
                                                    and a mapping instead of a tuple for the arguments.
lib/python/Screens/PluginBrowser.py:128: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                                  The translator cannot reorder the arguments.
                                                  Please consider using a format string with named arguments,
                                                  and a mapping instead of a tuple for the arguments.
lib/python/Components/Converter/ClientsStreaming.py:107: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                                                  The translator cannot reorder the arguments.
                                                                  Please consider using a format string with named arguments,
                                                                  and a mapping instead of a tuple for the arguments.
lib/python/Components/Converter/ClockToText.py:94: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                                            The translator cannot reorder the arguments.
                                                            Please consider using a format string with named arguments,
                                                            and a mapping instead of a tuple for the arguments.
lib/python/Components/Converter/ClockToText.py:97: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                                            The translator cannot reorder the arguments.
                                                            Please consider using a format string with named arguments,
                                                            and a mapping instead of a tuple for the arguments.
lib/python/Components/Converter/EventName.py:130: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                                           The translator cannot reorder the arguments.
                                                           Please consider using a format string with named arguments,
                                                           and a mapping instead of a tuple for the arguments.
lib/python/Components/Converter/EventName.py:131: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                                           The translator cannot reorder the arguments.
                                                           Please consider using a format string with named arguments,
                                                           and a mapping instead of a tuple for the arguments.
lib/python/Components/Converter/RemainingToText.py:58: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                                                The translator cannot reorder the arguments.
                                                                Please consider using a format string with named arguments,
                                                                and a mapping instead of a tuple for the arguments.
lib/python/Components/Converter/RotorPosition.py:32: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                                              The translator cannot reorder the arguments.
                                                              Please consider using a format string with named arguments,
                                                              and a mapping instead of a tuple for the arguments.
lib/python/Plugins/SystemPlugins/FastScan/plugin.py:100: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                                                  The translator cannot reorder the arguments.
                                                                  Please consider using a format string with named arguments,
                                                                  and a mapping instead of a tuple for the arguments.
lib/python/Plugins/SystemPlugins/FastScan/plugin.py:100: warning: 'msgid_plural' format string with unnamed arguments cannot be properly localized:
                                                                  The translator cannot reorder the arguments.
                                                                  Please consider using a format string with named arguments,
                                                                  and a mapping instead of a tuple for the arguments.


Geen wonder... Had slechts een dm7000, maar wel ook een rotor. eigenlijk al een tijdje ook een dm600 en dm7025. Maar nu kijkend met een et9000 en vuduo

Re: merge requests for PLi's git #1026 Taapat

  • PLi® Core member
  • 2,345 posts

+121
Excellent

Posted 9 February 2017 - 08:36

These are just warnings for multiple arguments.
For example in RecordTimer.py: https://github.com/O...rdTimer.py#L512
message = _("You must switch to the service %s (%s - '%s')!\n") % (type, self.service_ref.getServiceName(), self.name)

Of course, it is a possibility that in the some language these arguments it is better to use in a different order.

But I think that translators can adapt this order, and we can live with it without changing anything.

Edited by Taapat, 9 February 2017 - 08:39.


Re: merge requests for PLi's git #1027 mirakels

  • Forum Moderator
    PLi® Core member
  • 7,603 posts

+62
Good

Posted 9 February 2017 - 10:11

yes I know they are warnings. It put it here just as a hint in case someone see a simple fix for (some of) them... ;)


Geen wonder... Had slechts een dm7000, maar wel ook een rotor. eigenlijk al een tijdje ook een dm600 en dm7025. Maar nu kijkend met een et9000 en vuduo

Re: merge requests for PLi's git #1028 Persian Prince

  • Senior Member
  • 1,982 posts

+247
Excellent

Posted 9 February 2017 - 11:20

Thanks a lot :)
I think if you do this every month it would be ok.
Did you remove obsolete strings too ?

Open Vision sources: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1029 Taapat

  • PLi® Core member
  • 2,345 posts

+121
Excellent

Posted 9 February 2017 - 12:16

so guess what.... I rebuild the po files and pushed them!

 

Before that, you could add my pull request where these new values already translated: https://github.com/O...nigma2/pull/634

Now, due to the POT-Creation-Date change, he has a conflict  :wacko:.



Re: merge requests for PLi's git #1030 mirakels

  • Forum Moderator
    PLi® Core member
  • 7,603 posts

+62
Good

Posted 9 February 2017 - 15:46

Thanks a lot :)
I think if you do this every month it would be ok.
Did you remove obsolete strings too ?

yes the tooling does that automatically. The obsolete strings are put at the end of the .po file prefixed by a #.

It is up to the translators to remove these when they think they are really useless (some may be handy as the strings has been changed slightly and the translation can be easily reused (but that may depend on the editing tools again...))


Geen wonder... Had slechts een dm7000, maar wel ook een rotor. eigenlijk al een tijdje ook een dm600 en dm7025. Maar nu kijkend met een et9000 en vuduo

Re: merge requests for PLi's git #1031 mirakels

  • Forum Moderator
    PLi® Core member
  • 7,603 posts

+62
Good

Posted 9 February 2017 - 15:48

 

so guess what.... I rebuild the po files and pushed them!

 

Before that, you could add my pull request where these new values already translated: https://github.com/O...nigma2/pull/634

Now, due to the POT-Creation-Date change, he has a conflict  :wacko:.

 

 

Sorry about that :mellow: . This was probably one of the reason not to automate the .po generation process...

 

Is it hard to merge the changes back in your current copy as probably there are many new strings you have to translate now?


Geen wonder... Had slechts een dm7000, maar wel ook een rotor. eigenlijk al een tijdje ook een dm600 en dm7025. Maar nu kijkend met een et9000 en vuduo

Re: merge requests for PLi's git #1032 Taapat

  • PLi® Core member
  • 2,345 posts

+121
Excellent

Posted 9 February 2017 - 16:05

As you can see, the only conflict is POT-Creation-Date: https://github.com/O...l/634/conflicts
I regularly update Latvian language translation by generating it from the enigma.
So the only changes in lv.po are translated the two values that you added when generated translations.
 
Therefore, maybe you could add my pull request with resolve conflict in POT-Creation-Date. Of course no matter which date you leave.


Re: merge requests for PLi's git #1033 Taapat

  • PLi® Core member
  • 2,345 posts

+121
Excellent

Posted 9 February 2017 - 16:14

Ok I resolve conflict on github by myself.


Edited by Taapat, 9 February 2017 - 16:14.


Re: merge requests for PLi's git #1034 Persian Prince

  • Senior Member
  • 1,982 posts

+247
Excellent

Posted 11 February 2017 - 07:50

https://github.com/O...nigma2/pull/644 Update unicable.xml thanks to Open ATV :)


Edited by Persian Prince, 11 February 2017 - 07:50.

Open Vision sources: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1035 littlesat

  • PLi® Core member
  • 57,187 posts

+699
Excellent

Posted 11 February 2017 - 08:38

Is not good. We do not have aliasses for jess and unicable. Please use jess when it is jess an no other thinks.

WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W


Re: merge requests for PLi's git #1036 Persian Prince

  • Senior Member
  • 1,982 posts

+247
Excellent

Posted 11 February 2017 - 09:04

https://github.com/O...nigma2/pull/645 Not related to unicable.xml though


Open Vision sources: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1037 Persian Prince

  • Senior Member
  • 1,982 posts

+247
Excellent

Posted 11 February 2017 - 16:21

https://github.com/O...nigma2/pull/645

 

:( github is such pain in ... because it automatically merges new commits in last merge request and I have to wait for it to be merged or closed.
Please tell me which ones do you accept so I can send them one by one from different forks.

Open Vision sources: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1038 Taapat

  • PLi® Core member
  • 2,345 posts

+121
Excellent

Posted 11 February 2017 - 18:45

You do not need blame GitHub about the fact that you do not know how to work with git.
Why you do not offer pull request from individual branch?

Edited by Taapat, 11 February 2017 - 18:45.


Re: merge requests for PLi's git #1039 Persian Prince

  • Senior Member
  • 1,982 posts

+247
Excellent

Posted 12 February 2017 - 11:36

https://github.com/O...nigma2/pull/648

https://github.com/O...nigma2/pull/650

https://github.com/O...nigma2/pull/653


Open Vision sources: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1040 Persian Prince

  • Senior Member
  • 1,982 posts

+247
Excellent

Posted 13 February 2017 - 10:55

https://github.com/O...nigma2/pull/657

https://github.com/O...nigma2/pull/658

https://github.com/O...nigma2/pull/659


Open Vision sources: https://github.com/OpenVisionE2



20 user(s) are reading this topic

0 members, 20 guests, 0 anonymous users