i18n improves. Translators will start to hate me, too.

svn path=/trunk/KDE/kdeedu/kalzium/src/element.cpp; revision=419933

diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp
index 1c6cfe2730cbcd78b93df9ffd25a7c1453e549d5..8c74979fd018cf8c0f63c01de36b42197df8e006 100644 (file)
--- 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<sup>-12</sup> m" );
+                                       v = i18n( "%1 10<sup>-12</sup> 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/m<sup>3</sup>" );
+                                       v = i18n( "%1 kg/m<sup>3</sup>" ).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/cm<sup>3</sup>" );
+                                               v = i18n( "%1 g/cm<sup>3</sup>" ).arg( QString::number( val ) );
                                        }
                                        break;
                        }