patchFreeciv - Patches: patch #4454, Reduce duplication in POTFILES.*

 
 
Show feedback again

patch #4454: Reduce duplication in POTFILES.*

Submitted by:  Jacob Nevins <jtn>
Submitted on:  Sun 26 Jan 2014 01:38:52 PM UTC  
 
Category: bootstrapPriority: 5 - Normal
Status: DonePrivacy: Public
Assigned to: Marko Lindqvist <cazfi>Open/Closed: Closed
Planned Release: 3.0.0Contains string changes: None

Add a New Comment (Rich MarkupRich Markup):
   

You are not logged in

Please log in, so followups can be emailed to you.

 

(Jump to the original submission Jump to the original submission)

Wed 14 Sep 2016 05:45:38 AM UTC, SVN revision 33795:

Added script to generate POTFILES.skip files when needed, so there's no longer need
to maintain them manually.

Requested by Jacob Nevins

See patch #4454

(Browse SVN revision 33795)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Mon 12 Sep 2016 05:51:10 AM UTC, comment #7:

Attached patch adds script to generate POTFILES.skip when one needs it, so there's no need to keep them manually maintained in svn.

When committing, also remove current POTFILES.skip files from the svn.

(file #28599)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 21 Jan 2015 01:06:31 AM UTC, comment #6:

This is something that should be made on top of update gettext infra in S2_6.

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 01 Feb 2014 08:32:54 PM UTC, SVN revision 24331:

Dropped data files from POTFILES.skip files. Added missing source files to them.

Requested by Jacob Nevins

See patch #4454

(Browse SVN revision 24331)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 01 Feb 2014 08:32:49 PM UTC, SVN revision 24330:

Dropped data files from POTFILES.skip files. Added missing source files to them.

Requested by Jacob Nevins

See patch #4454

(Browse SVN revision 24330)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 30 Jan 2014 01:25:22 AM UTC, comment #3:

Patches to drop data files, especially nations, from POTFILES.skip files. Also add missing ruledit source files to TRUNK freeciv|nations POTFILES.skip

(file #19896, file #19897)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sun 26 Jan 2014 03:29:31 PM UTC, comment #2:

> POTFILES.skip is used by "intltool-update -m" I use regularly.

Oh right -- I've never used (or even looked at) intltool. I should investigate it.

(Tangent: if we already have a dependency or support for intltool, perhaps we could make more effort to make .desktop files etc translatable?)

Jacob Nevins <jtn>
Project Administrator
Sun 26 Jan 2014 02:55:10 PM UTC, comment #1:

POTFILES.skip is used by "intltool-update -m" I use regularly. However:
1) Only some files would need to be listed there. Notably nation rulesets, which are the most common files to be added, would not need to be.
2) It's a bit broken in other ways currently, but I want that fixed rather than abandoned (Notably intltool-update is hardcoded to look after the files in po/)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sun 26 Jan 2014 01:38:52 PM UTC, original submission:

As the first step toward sorting out multi-translation-domain procedures (patch #4190), I'd like to reduce the duplication of POTFILES file lists.

Currently, when you add a new file to svn (including nations), as well as having to plumb it into the Makefiles, I think you have to edit 3 of 6 files: translations/{freeciv,nations,ruledit}/POTFILES.{in,skip}. These are going to be a right pain to keep in sync (already they are not).

Some vague ideas for how we can improve this:

  • Do we actually need POTFILES.skip? I can't see it referenced anywhere -- is it used by some tool we depend on? If not, we can get rid of that.
  • It feels like we could automate nations at least -- when generating translations/*/POTFILES, can we get the list of ruleset files from data/nation/Makefile.am:pkgdata_DATA, and then filter by whether each file mentions translation_domain="freeciv"?
  • We could also filter ruledit by location (any file in tools/ruledit/ has strings collected for translations/ruledit rather than translations/freeciv).
    • (This is independent of whether we can one day get rid of special R__() marking entirely. Right now, use of R__() vs _() is coterminous with being in tools/ruledit/ and the current arrangements require us to maintain that.)

With the above measures, it would perhaps be sufficient to have a single file translations/POTFILES.in (which could perhaps not mention nations at all).

Jacob Nevins <jtn>
Project Administrator

 

(Note: upload size limit is set to 1024 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

Attached Files
file #28599:  GenerateSkips.patch added by cazfi (4kB - text/x-diff)
file #19896:  PotSkip.patch.bz2 added by cazfi (4kB - application/x-bzip)
file #19897:  PotSkip-S2_5.patch added by cazfi (19kB - text/x-diff)

 

Depends on the following items: None found

Digest:
   patch dependencies.

 

Carbon-Copy List
  • -unavailable- added by cazfi (Posted a comment)
  • -unavailable- added by jtn (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Error: not logged in

     

     

    Follow 11 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Wed 14 Sep 2016 05:45:50 AM UTCcazfiStatusReady For Test=>Done
      Assigned toNone=>cazfi
      Open/ClosedOpen=>Closed
    Mon 12 Sep 2016 05:51:10 AM UTCcazfiAttached File-=>Added GenerateSkips.patch, #28599
      StatusNeed Info=>Ready For Test
    Mon 22 Aug 2016 07:49:45 PM UTCcazfiPlanned Release2.6.0, 3.0.0=>3.0.0
    Wed 21 Jan 2015 01:06:31 AM UTCcazfiCategoryNone=>bootstrap
      Planned Release2.5.0,2.6.0=>2.6.0, 3.0.0
    Thu 30 Jan 2014 01:25:22 AM UTCcazfiAttached File-=>Added PotSkip.patch.bz2, #19896
      Attached File-=>Added PotSkip-S2_5.patch, #19897
    Sun 26 Jan 2014 01:40:22 PM UTCjtnDependencies-=>patch #4190 is dependent
    Show feedback again

    Back to the top


    Powered by Savane 3.1-cleanup