From 228ee3900058ed13efd99dfdaa22de492826c090 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 2 Jan 2012 13:53:27 +0100 Subject: another string composition bad for l10n Delete $1 / Format $1 where $1 can be Header / Footer It turned out that translation of Header and Footer can be different when deleting and when formatting, at least in Estonian. --- sw/source/ui/docvw/HeaderFooterWin.cxx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'sw/source/ui/docvw/HeaderFooterWin.cxx') diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index 64e75e456d41..df39978d590f 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -171,17 +171,17 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, const SwPageFrm* pPag m_pPopupMenu = new PopupMenu( SW_RES( MN_HEADERFOOTER_BUTTON ) ); // Rewrite the menu entries' text - String sType = SW_RESSTR( STR_FOOTER ); if ( m_bIsHeader ) - sType = SW_RESSTR( STR_HEADER ); - SwRewriter aRewriter; - aRewriter.AddRule( String::CreateFromAscii( "$1" ), sType ); - - String aText = m_pPopupMenu->GetItemText( FN_HEADERFOOTER_EDIT ); - m_pPopupMenu->SetItemText( FN_HEADERFOOTER_EDIT, aRewriter.Apply( aText ) ); + { + m_pPopupMenu->SetItemText( FN_HEADERFOOTER_EDIT, SW_RESSTR( STR_FORMAT_HEADER ) ); + m_pPopupMenu->SetItemText( FN_HEADERFOOTER_DELETE, SW_RESSTR( STR_DELETE_HEADER ) ); + } + else + { + m_pPopupMenu->SetItemText( FN_HEADERFOOTER_EDIT, SW_RESSTR( STR_FORMAT_FOOTER ) ); + m_pPopupMenu->SetItemText( FN_HEADERFOOTER_DELETE, SW_RESSTR( STR_DELETE_FOOTER ) ); + } - aText = m_pPopupMenu->GetItemText( FN_HEADERFOOTER_DELETE ); - m_pPopupMenu->SetItemText( FN_HEADERFOOTER_DELETE, aRewriter.Apply( aText ) ); SetPopupMenu( m_pPopupMenu ); m_aFadeTimer.SetTimeout( 50 ); -- cgit v1.2.3