make december postfix translatable

Author: jef-n

src/app/main.cpp

@@ -752,7 +752,7 @@ int main( int argc, char *argv[] )
 
 // (if Windows/Mac, use icon from resource)
 #if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
-  myApp.setWindowIcon( QIcon( QgsApplication::iconsPath() + "qgis-icon-60x60.png" ) );
+  myApp.setWindowIcon( QIcon( QgsApplication::appIconPath() ) );
 #endif
 
   //

src/app/qgsabout.cpp

@@ -72,16 +72,7 @@ void QgsAbout::init()
   connect( developersMapView, SIGNAL( linkClicked( const QUrl & ) ), this, SLOT( openUrl( const QUrl & ) ) );
 
   // set the 60x60 icon pixmap
-  QPixmap icon;
-  if ( QDate::currentDate().month() == 12 )
-  {
-    icon.load( QgsApplication::iconsPath() + "qgis-icon-60x60_xmas.png" );
-  }
-  else
-  {
-    icon.load( QgsApplication::iconsPath() + "qgis-icon-60x60.png" );
-  }
-  qgisIcon->setPixmap( icon );
+  qgisIcon->setPixmap( QPixmap( QgsApplication::appIconPath() ) );
 
   //read the authors file to populate the svn committers list
   QStringList lines;

src/app/qgssponsors.cpp

@@ -38,9 +38,6 @@ QgsSponsors::~QgsSponsors()
 
 void QgsSponsors::init()
 {
-
   // set the 60x60 icon pixmap
-  QPixmap icon( QgsApplication::iconsPath() + "qgis-icon-60x60.png" );
-  qgisIcon->setPixmap( icon );
-
+  qgisIcon->setPixmap( QPixmap( QgsApplication::appIconPath() ) );
 }

src/app/qgstipgui.cpp

@@ -64,8 +64,7 @@ void QgsTipGui::showTip( QgsTip myTip )
   //        once Qt 4.6 is the minimum required version for building QGIS.
   //
   QString content = "<img src='"
-                    + QgsApplication::iconsPath()
-                    + "qgis-icon-60x60.png"
+                    + QgsApplication::appIconPath()
                     + "' style='float:left;'>"
                     + "<h2>"
                     + myTip.title()

src/core/qgsapplication.cpp

@@ -382,6 +382,10 @@ QString QgsApplication::activeThemePath()
   return userThemesFolder() + QDir::separator() + themeName() + QDir::separator() + "icons/";
 }
 
+QString QgsApplication::appIconPath()
+{
+  return iconsPath() + ( QDate::currentDate().month() == 12 ? tr( "qgis-icon-60x60_xmas.png", "December application icon" ) : QString( "qgis-icon-60x60.png" ) );
+}
 
 QString QgsApplication::iconPath( const QString& iconFile )
 {

src/core/qgsapplication.h

@@ -232,6 +232,9 @@ class CORE_EXPORT QgsApplication : public QApplication
     //! deletes provider registry and map layer registry
     static void exitQgis();
 
+    //! get application icon
+    static QString appIconPath();
+
     /** Constants for endian-ness */
     enum endian_t
     {