Skip to content

Commit

Permalink
Fix for bug [ 1385358 ] PT translation gives errors when exporting to…
Browse files Browse the repository at this point in the history 
… mapserver

Units are not translated anymore


git-svn-id: http://svn.osgeo.org/qgis/trunk@4684 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
homann committed Jan 14, 2006
1 parent cce957c commit 8aae096
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 32 deletions.
8 changes: 8 additions & 0 deletions src/gui/qgsmapserverexport.cpp
View file
Expand Up @@ -38,6 +38,14 @@ QgsMapserverExport::QgsMapserverExport(QgsMapCanvas * _map, QWidget * parent, co
setupUi(this);
connect(buttonOk, SIGNAL(clicked()), this, SLOT(accept()));
connect(buttonCancel, SIGNAL(clicked()), this, SLOT(reject()));
// These values shouldn't be translated, the units should be in english in the map file
// Qt designer adds translate() by default
cmbMapUnits->addItem(QString::fromUtf8("dd"));
cmbMapUnits->addItem(QString::fromUtf8("feet"));
cmbMapUnits->addItem(QString::fromUtf8("meters"));
cmbMapUnits->addItem(QString::fromUtf8("miles"));
cmbMapUnits->addItem(QString::fromUtf8("inches"));
cmbMapUnits->addItem(QString::fromUtf8("kilometers"));
}

// Default destructor
Expand Down
39 changes: 7 additions & 32 deletions src/ui/qgsmapserverexportbase.ui
View file
Expand Up @@ -122,6 +122,9 @@
<property name="title" >
<string>Map</string>
</property>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>10</number>
Expand All @@ -147,38 +150,7 @@
</widget>
</item>
<item row="1" column="1" colspan="2" >
<widget class="QComboBox" name="cmbMapUnits" >
<item>
<property name="text" >
<string>dd</string>
</property>
</item>
<item>
<property name="text" >
<string>feet</string>
</property>
</item>
<item>
<property name="text" >
<string>meters</string>
</property>
</item>
<item>
<property name="text" >
<string>miles</string>
</property>
</item>
<item>
<property name="text" >
<string>inches</string>
</property>
</item>
<item>
<property name="text" >
<string>kilometers</string>
</property>
</item>
</widget>
<widget class="QComboBox" name="cmbMapUnits" />
</item>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel3" >
Expand Down Expand Up @@ -281,6 +253,9 @@
<property name="title" >
<string>Web Interface Definition</string>
</property>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>10</number>
Expand Down

0 comments on commit 8aae096

Please sign in to comment.