Re: locale messages gnu patch 13631

[François Dumont <francois dot cppdevs at free dot fr>]

On 01/03/2011 09:40 PM, Jonathan Wakely wrote:
> On 3 January 2011 20:24, Jonathan Wakely<jwakely.gcc@gmail.com>  wrote:
>    
> > On 3 January 2011 20:20, François Dumont wrote:
> >      
> > >     So, anyone can run the test for me ?
> > >        
> > Sure, I'll try it now.
> >
> >      
> a.out: 4.cc:56: void test01(): Assertion `s01 == "secondes"' failed.
>
> I only have the English catalog for okular
>
> $ locate okular.mo
> /usr/share/locale/en_GB/LC_MESSAGES/okular.mo
>
> $ locate '*fr*pulseaudio.mo'
> /usr/share/locale/fr/LC_MESSAGES/pulseaudio.mo
>
>    
This is a good first result, we already see that the 2 catalogs have 
different ids. Could you change the test to target a catalog you have a 
use an existing entry in this catalog.

If you don't have time here is a modified version of the test that will 
show if at least access to the french catalog of pulse audio is working.

If it works do you agree to commit the patch ?

Regards
// { dg-require-namedlocale "fr_FR" }

// 2001-07-17 Benjamin Kosnik  <bkoz@redhat.com>

// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library.  This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.

// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3.  If not see
// <http://www.gnu.org/licenses/>.

// 22.2.7.1.1 messages members

#include <locale>
#include <testsuite_hooks.h>

void test01()
{
  using namespace std;
  typedef std::messages<char>::catalog catalog;
  typedef std::messages<char>::string_type string_type;

  bool test __attribute__((unused)) = true;

  // basic construction
  locale loc_c = locale::classic();
  locale loc_fr = locale("fr_FR");
  VERIFY( loc_c != loc_fr );

  // cache the messages facets
  const messages<char>& mssg_fr = use_facet<messages<char> >(loc_fr); 

  // catalog open(const string&, const locale&) const;
  // string_type get(catalog, int, int, const string_type& ) const; 
  // void close(catalog) const;

  // Check locale.
  catalog cat_okular = mssg_fr.open("okular", loc_c);
  VERIFY( cat_okular >= 0 );
  catalog cat_pulseaudio = mssg_fr.open("pulseaudio", loc_c);
  VERIFY( cat_pulseaudio >= 0 );
  VERIFY( cat_okular != cat_pulseaudio );

  string s01 = mssg_fr.get(cat_okular, 0, 0, "seconds");
  string s02 = mssg_fr.get(cat_pulseaudio, 0, 0, "PulseAudio Sound Server");

  VERIFY( s01 == "secondes" ||
	  s02 == "Serveur de Son PulseAudio" );
  VERIFY( s02 == "Serveur de Son PulseAudio" );
  VERIFY( s01 == "secondes" );
  mssg_fr.close(cat_pulseaudio);
  mssg_fr.close(cat_okular);
}

int main()
{
  test01();
  return 0;
}