From 5887da813334c882027cf9447a5902fb48d207e4 Mon Sep 17 00:00:00 2001 From: Eric Petit Date: Fri, 18 Apr 2003 15:25:51 +0000 Subject: [PATCH] ALL: fixed i18n under BeOS --- Makefile.am | 6 ++++++ modules/gui/beos/InterfaceWindow.cpp | 12 ++++++------ src/libvlc.c | 6 +++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 494f197f73..387e3e5c75 100644 --- a/Makefile.am +++ b/Makefile.am @@ -443,9 +443,15 @@ DEPENDENCIES_vlc = lib/libvlc.a $(L_builtin) $(DATA_win32_rc) $(LIB_intl) vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) @rm -f vlc$(EXEEXT) $(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS) + if HAVE_BEOS xres -o $@ ./share/vlc_beos.rsrc mimeset -f $@ + $(INSTALL) -d locale + for i in $(ALL_LINGUAS); do \ + mkdir -p locale/$${i}/LC_MESSAGES ; \ + cp po/$${i}.gmo locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ + done endif # Install the symlinks diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp index b33b5f141e..b60c059c22 100644 --- a/modules/gui/beos/InterfaceWindow.cpp +++ b/modules/gui/beos/InterfaceWindow.cpp @@ -2,7 +2,7 @@ * InterfaceWindow.cpp: beos interface ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: InterfaceWindow.cpp,v 1.31 2003/03/12 23:15:03 titer Exp $ + * $Id: InterfaceWindow.cpp,v 1.32 2003/04/18 15:25:50 titer Exp $ * * Authors: Jean-Marc Dressler * Samuel Hocevar @@ -242,7 +242,7 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char* name, AddChild( p_mediaControl ); // Add the file Menu - BMenu* fileMenu = new BMenu( "File" ); + BMenu* fileMenu = new BMenu( _("File") ); fMenuBar->AddItem( fileMenu ); fileMenu->AddItem( new BMenuItem( "Open File" B_UTF8_ELLIPSIS, new BMessage( OPEN_FILE ), 'O') ); @@ -263,7 +263,7 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char* name, fSubtitlesMenu = new LanguageMenu("Subtitles", SPU_ES, p_wrapper); /* Add the Audio menu */ - fAudioMenu = new BMenu( "Audio" ); + fAudioMenu = new BMenu( _("Audio") ); fMenuBar->AddItem ( fAudioMenu ); fAudioMenu->AddItem( fLanguageMenu ); fAudioMenu->AddItem( fSubtitlesMenu ); @@ -275,7 +275,7 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char* name, fGotoMenuMI = new BMenuItem( "Goto Menu", new BMessage( NAVIGATE_MENU ) ); /* Add the Navigation menu */ - fNavigationMenu = new BMenu( "Navigation" ); + fNavigationMenu = new BMenu( _("Navigation") ); fMenuBar->AddItem( fNavigationMenu ); fNavigationMenu->AddItem( fGotoMenuMI ); fNavigationMenu->AddSeparatorItem(); @@ -288,7 +288,7 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char* name, fNavigationMenu->AddItem( fChapterMenu = new ChapterMenu( "Go to Chapter", p_intf ) ); /* Add the Speed menu */ - fSpeedMenu = new BMenu( "Speed" ); + fSpeedMenu = new BMenu( _("Speed") ); fSpeedMenu->SetRadioMode( true ); fSpeedMenu->AddItem( fSlowerMI = new BMenuItem( "Slower", new BMessage( SLOWER_PLAY ) ) ); fNormalMI = new BMenuItem( "Normal", new BMessage( NORMAL_PLAY ) ); @@ -299,7 +299,7 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char* name, fMenuBar->AddItem( fSpeedMenu ); /* Add the Show menu */ - fShowMenu = new BMenu( "Window" ); + fShowMenu = new BMenu( _("Window") ); fShowMenu->AddItem( new BMenuItem( "Play List" B_UTF8_ELLIPSIS, new BMessage( OPEN_PLAYLIST ), 'P') ); fShowMenu->AddItem( new BMenuItem( "Messages" B_UTF8_ELLIPSIS, diff --git a/src/libvlc.c b/src/libvlc.c index c492539586..f96c6c5769 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -2,7 +2,7 @@ * libvlc.c: main libvlc source ***************************************************************************** * Copyright (C) 1998-2002 VideoLAN - * $Id: libvlc.c,v 1.78 2003/04/09 19:58:25 gbazin Exp $ + * $Id: libvlc.c,v 1.79 2003/04/18 15:25:51 titer Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -1007,7 +1007,7 @@ static void SetLanguage ( char const *psz_lang ) && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) char * psz_path; -#if defined( SYS_DARWIN ) || defined ( WIN32 ) +#if defined( SYS_DARWIN ) || defined ( WIN32 ) || defined( SYS_BEOS ) char psz_tmp[1024]; #endif @@ -1043,7 +1043,7 @@ static void SetLanguage ( char const *psz_lang ) } /* Specify where to find the locales for current domain */ -#if !defined( SYS_DARWIN ) && !defined( WIN32 ) +#if !defined( SYS_DARWIN ) && !defined( WIN32 ) && !defined( SYS_BEOS ) psz_path = LOCALEDIR; #else snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc.psz_vlcpath, -- 2.39.2