[Freeciv-Dev] Re: Using gettext in client/helpdata.c (PR#1744)

[Raimar Falke <rf13@xxxxxxxxxxxxxxxxx>]

On Thu, Jul 25, 2002 at 08:05:58PM +0900, SAWADA Katsuya wrote:
> Raimar Falke <rf13@xxxxxxxxxxxxxxxxx> writes:
> > Updated patch attached. It is larger but now handles the case of
> > multiple F_CARRIER and F_MISSILE_CARRIER units.
> 
> > +      if (j == num_allowed_units - 2) {
> > +   deli_str = _(" or ");
> > +      } else if (j < num_allowed_units - 1) {
> > +   deli_str = ", ";
> > +      }
> 
> It is not perfect because it strongly depend on English (or
> Anglo-Saxon?) syntax, but better than version 1.13.0 code.
> 
> # In my language, Japanese, there is no standard rule to combine words
> # with 'or'. So if I try to translate it into natural Japanese,
> # I need a full sentence.
> 
> Would you change from
> > +   deli_str = ", ";
> to Q_("?or:, ") ?
> 
> And also would you change get_units_with_flag_string?
> 
> Following is your patch with above change.
> I am happy if your patch with above change is applied.

The changes are ok.

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
  +#if defined(__alpha__) && defined(CONFIG_PCI)
  +       /*
  +        * The meaning of life, the universe, and everything. Plus
  +        * this makes the year come out right.
  +        */
  +       year -= 42;
  +#endif
    -- Patch for 1.3.2 (kernel/time.c) from Marcus Meissner