From c487b57edec80fad9508cd6dc2b35a5b91b866cb Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 30 May 2005 21:26:50 +0000 Subject: [PATCH] i18n improves. Translators will start to hate me, too. svn path=/trunk/KDE/kdeedu/kalzium/src/element.cpp; revision=419933 --- kalzium/src/element.cpp | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp index 1c6cfe2..8c74979 100644 --- a/kalzium/src/element.cpp +++ b/kalzium/src/element.cpp @@ -122,18 +122,15 @@ const QString Element::adjustUnits( const int type ) { switch (Prefs::temperature()) { case 0: //Kelvin - v = QString::number( val ); - v.append( "K" ); + v = i18n( "%1 is the temperature in Kelvin", "%1 K" ).arg( QString::number( val ) ); break; case 1://Kelvin to Celsius val-=273.15; - v = QString::number( val ); - v.append( "C" ); + v = i18n( "%1 is the temperature in Celsius", "%1 C" ).arg( QString::number( val ) ); break; case 2: // Kelvin to Fahrenheit val = val * 1.8 - 459.67; - v = QString::number( val ); - v.append( "F" ); + v = i18n( "%1 is the temperature in Fahrenheit", "%1 F" ).arg( QString::number( val ) ); break; } } @@ -160,14 +157,10 @@ const QString Element::adjustUnits( const int type ) switch ( Prefs::units() ) { case 0://use SI-values (meter for length) - v = QString::number( val ); - - v.append( " 10-12 m" ); + v = i18n( "%1 10-12 m" ).arg( QString::number( val ) ); break; case 1://use picometer, the most common unit for radii - v = QString::number( val ); - - v.append( i18n( " pm" ) ); + v = i18n( "%1 pm" ).arg( QString::number( val ) ); break; } } @@ -183,10 +176,10 @@ const QString Element::adjustUnits( const int type ) switch ( Prefs::units() ) { case 0: - v.append( i18n( " g/mol" ) ); + v = i18n( "%1 g/mol" ).arg( QString::number( val ) ); break; case 1: - v.append( i18n( " u" ) ); + v = i18n( "%1 u" ).arg( QString::number( val ) ); break; } } @@ -203,19 +196,16 @@ const QString Element::adjustUnits( const int type ) { case 0://use SI (kg per cubic-meter) val *= 1000; - v = QString::number( val ); - v.append( " kg/m3" ); + v = i18n( "%1 kg/m3" ).arg( QString::number( val ) ); break; case 1://use more common units if ( az() == 2 )//gasoline { - v = QString::number( val ); - v.append( " g/L" ); + v = i18n( "%1 g/L" ).arg( QString::number( val ) ); } else//liquid or solid { - v = QString::number( val ); - v.append( " g/cm3" ); + v = i18n( "%1 g/cm3" ).arg( QString::number( val ) ); } break; } -- 2.47.3