Skip to content
Permalink
Browse files

Spelling fixes, updates to chkspelling.sh

  • Loading branch information
nyalldawson committed Feb 2, 2016
1 parent d1cc6cc commit f3c7ab61e6f0bc6fbb4c700206eebc9243b085b5
@@ -142,8 +142,8 @@ class QgsComposerMapGrid : QgsComposerMapItem
enum GridUnit
{
MapUnit, /*!< grid units follow map units */
MM, /*!< grid units in millimetres */
CM /*!< grid units in centimetres */
MM, /*!< grid units in millimeters */
CM /*!< grid units in centimeters */
};

/** Grid drawing style
@@ -297,7 +297,7 @@ class QgsComposerMapGrid : QgsComposerMapItem

/** Calculates the maximum distance the grid extends beyond the QgsComposerMap's
* item rect
* @returns maximum extension in millimetres
* @returns maximum extension in millimeters
*/
double maxExtension();

@@ -416,14 +416,14 @@ class QgsComposerMapGrid : QgsComposerMapItem

/** Sets the length of the cross segments drawn for the grid. This is only used for grids
* with QgsComposerMapGrid::Cross styles
* @param length cross length in millimetres
* @param length cross length in millimeters
* @see crossLength
*/
void setCrossLength( const double length );

/** Retrieves the length of the cross segments drawn for the grid. This is only used for grids
* with QgsComposerMapGrid::Cross styles
* @returns cross length in millimetres
* @returns cross length in millimeters
* @see setCrossLength
*/
double crossLength() const;
@@ -569,13 +569,13 @@ class QgsComposerMapGrid : QgsComposerMapItem
*/
AnnotationPosition annotationPosition( const BorderSide border ) const;

/** Sets the distance between the map frame and annotations. Units are in millimetres.
/** Sets the distance between the map frame and annotations. Units are in millimeters.
* @param distance margin between map frame and annotations
* @see annotationFrameDistance
*/
void setAnnotationFrameDistance( const double distance );

/** Gets the distance between the map frame and annotations. Units are in millimetres.
/** Gets the distance between the map frame and annotations. Units are in millimeters.
* @returns margin between map frame and annotations
* @see setAnnotationFrameDistance
*/
@@ -701,15 +701,15 @@ class QgsComposerMapGrid : QgsComposerMapItem
/** Sets the grid frame width. This property controls how wide the grid frame is.
* The size of the line outlines drawn in the frame is controlled through the
* setFramePenSize method.
* @param width width of grid frame in millimetres
* @param width width of grid frame in millimeters
* @see frameWidth
*/
void setFrameWidth( const double width );

/** Gets the grid frame width. This property controls how wide the grid frame is.
* The size of the line outlines drawn in the frame can be retrieved via the
* framePenSize method.
* @returns width of grid frame in millimetres
* @returns width of grid frame in millimeters
* @see setFrameWidth
*/
double frameWidth() const;
@@ -46,7 +46,7 @@ class QgsStyleV2ExportImportDialog : QDialog
*/
void selectGroup( const QString& groupName );
/**
* Unselect the symbols belonging to the given group
* Deselect the symbols belonging to the given group
* @param groupName the name of the group to be deselected
*/
void deselectGroup( const QString& groupName);
@@ -17,6 +17,6 @@


RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') | sed -e 's/| /|/g; s/|$//;')
EX="\.(svn-base|tmp|xpm|ts|o)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|debian/build|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-1.0|debian/tmp|src/plugins/dxf2shp_converter/dxflib|python/ext-libs"
EX="\.(svn-base|tmp|xpm|ts|o)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|qgisstyle|LexerR.py|debian/build|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-1.0|debian/tmp|src/plugins/dxf2shp_converter/dxflib|python/ext-libs"

egrep --exclude-dir=.git --color=always "$RE" -ir . | egrep -iv "$EX"
egrep --exclude=*.{png,svg,db,bz2,pdf,qgs,qml,api} --exclude-dir=.git --color=always "$RE" -ir . | egrep -iv "$EX"
@@ -485,3 +485,11 @@ occurence:occurrence
overide:override
supress:suppress
surpress:suppress
artefact:artifact
artefacts:artifacts
metres:meters
millimetres:millimeters
centimetres:centimers

This comment has been minimized.

Copy link
@jef-n

jef-n Feb 2, 2016

Member

typo

kilometres:kilometers
unselect:deselect

@@ -7568,7 +7568,7 @@ void QgisApp::layerSubsetString()
if ( QMessageBox::question( NULL, tr( "Filter on joined fields" ),
tr( "You are about to set a subset filter on a layer that has joined fields. "
"Joined fields cannot be filtered, unless you convert the layer to a virtual layer first. "
"Would you like to create a virtual layer out of this layer first ?" ),
"Would you like to create a virtual layer out of this layer first?" ),
QMessageBox::Yes | QMessageBox::No ) == QMessageBox::Yes )
{
QgsVirtualLayerDefinition def = QgsVirtualLayerDefinitionUtils::fromJoinedLayer( vlayer );
@@ -36,7 +36,7 @@ QgsDecorationScaleBarDialog::QgsDecorationScaleBarDialog( QgsDecorationScaleBar&
switch ( units )
{
case 0:
spnSize->setSuffix( tr( " metres/km" ) );
spnSize->setSuffix( tr( " meters/km" ) );
break;
case 1:
spnSize->setSuffix( tr( " feet/miles" ) );
@@ -109,13 +109,13 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui:
void on_mWMSInspireScenario2_toggled( bool on );

/*!
* Slots to select/unselect all the WFS layers
* Slots to select/deselect all the WFS layers
*/
void on_pbnWFSLayersSelectAll_clicked();
void on_pbnWFSLayersUnselectAll_clicked();

/*!
* Slots to select/unselect all the WCS layers
* Slots to select/deselect all the WCS layers
*/
void on_pbnWCSLayersSelectAll_clicked();
void on_pbnWCSLayersUnselectAll_clicked();
@@ -172,8 +172,8 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem
enum GridUnit
{
MapUnit, /*!< grid units follow map units */
MM, /*!< grid units in millimetres */
CM /*!< grid units in centimetres */
MM, /*!< grid units in millimeters */
CM /*!< grid units in centimeters */
};

/** Grid drawing style
@@ -327,7 +327,7 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem

/** Calculates the maximum distance the grid extends beyond the QgsComposerMap's
* item rect
* @returns maximum extension in millimetres
* @returns maximum extension in millimeters
*/
double maxExtension();

@@ -446,14 +446,14 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem

/** Sets the length of the cross segments drawn for the grid. This is only used for grids
* with QgsComposerMapGrid::Cross styles
* @param length cross length in millimetres
* @param length cross length in millimeters
* @see crossLength
*/
void setCrossLength( const double length ) { mCrossLength = length; }

/** Retrieves the length of the cross segments drawn for the grid. This is only used for grids
* with QgsComposerMapGrid::Cross styles
* @returns cross length in millimetres
* @returns cross length in millimeters
* @see setCrossLength
*/
double crossLength() const { return mCrossLength; }
@@ -617,13 +617,13 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem
*/
AnnotationPosition annotationPosition( const BorderSide border ) const;

/** Sets the distance between the map frame and annotations. Units are in millimetres.
/** Sets the distance between the map frame and annotations. Units are in millimeters.
* @param distance margin between map frame and annotations
* @see annotationFrameDistance
*/
void setAnnotationFrameDistance( const double distance ) { mAnnotationFrameDistance = distance; }

/** Gets the distance between the map frame and annotations. Units are in millimetres.
/** Gets the distance between the map frame and annotations. Units are in millimeters.
* @returns margin between map frame and annotations
* @see setAnnotationFrameDistance
*/
@@ -749,15 +749,15 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem
/** Sets the grid frame width. This property controls how wide the grid frame is.
* The size of the line outlines drawn in the frame is controlled through the
* setFramePenSize method.
* @param width width of grid frame in millimetres
* @param width width of grid frame in millimeters
* @see frameWidth
*/
void setFrameWidth( const double width ) { mGridFrameWidth = width; }

/** Gets the grid frame width. This property controls how wide the grid frame is.
* The size of the line outlines drawn in the frame can be retrieved via the
* framePenSize method.
* @returns width of grid frame in millimetres
* @returns width of grid frame in millimeters
* @see setFrameWidth
*/
double frameWidth() const { return mGridFrameWidth; }
@@ -251,7 +251,7 @@ void QgsProjectionSelector::applySelection( int column, QString value )
else
{
QgsDebugMsg( QString( "nothing found for %1,%2" ).arg( column ).arg( value ) );
// unselect the selected item to avoid confusing the user
// deselect the selected item to avoid confusing the user
lstCoordinateSystems->clearSelection();
lstRecent->clearSelection();
teProjection->setText( "" );
@@ -77,7 +77,7 @@ class GUI_EXPORT QgsStyleV2ExportImportDialog : public QDialog, private Ui::QgsS
*/
void selectGroup( const QString& groupName );
/**
* Unselect the symbols belonging to the given group
* Deselect the symbols belonging to the given group
* @param groupName the name of the group to be deselected
*/
void deselectGroup( const QString& groupName );
@@ -15,8 +15,7 @@
</property>
<property name="windowIcon">
<iconset>
<normaloff/>
</iconset>
<normaloff>.</normaloff>.</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
@@ -65,7 +64,7 @@
<item>
<widget class="QPushButton" name="mSelectAllButton">
<property name="text">
<string>select all</string>
<string>Select all</string>
</property>
</widget>
</item>
@@ -85,7 +84,7 @@
<item>
<widget class="QPushButton" name="mUnselectAllButton">
<property name="text">
<string>unselect all</string>
<string>Deselect all</string>
</property>
</widget>
</item>
@@ -218,7 +218,7 @@ void QgsVirtualLayerSourceSelect::on_buttonBox_accepted()
QString id( mLayerNameCombo->itemData( idx ).toString() );
if ( !id.isEmpty() && mLayerNameCombo->currentText() == QgsMapLayerRegistry::instance()->mapLayer( id )->name() )
{
int r = QMessageBox::warning( nullptr, tr( "Warning" ), tr( "A virtual layer of this name already exists, would you like to overwrite it ?" ), QMessageBox::Yes | QMessageBox::No );
int r = QMessageBox::warning( nullptr, tr( "Warning" ), tr( "A virtual layer of this name already exists, would you like to overwrite it?" ), QMessageBox::Yes | QMessageBox::No );
if ( r == QMessageBox::Yes )
{
emit replaceVectorLayer( id, def.toString(), layerName, "virtual" );
@@ -684,7 +684,7 @@ void QgsWMSSourceSelect::applySelectionConstraints( QTreeWidgetItem *item )

if ( firstNewStyle || style )
{
// individual style selected => unselect layer and all parent groups
// individual style selected => deselect layer and all parent groups
QTreeWidgetItem *parent = item;
while ( parent )
{
@@ -78,7 +78,7 @@ def createColorRamp():

def createLabelFormat():
format = QgsRendererRangeV2LabelFormat()
template = "%1 - %2 metres"
template = "%1 - %2 meters"
precision = 5
format.setFormat(template)
format.setPrecision(precision)
@@ -189,7 +189,7 @@ def testQgsRendererRangeV2LabelFormat_1(self):
"""Test QgsRendererRangeV2LabelFormat getter/setter functions"""
format = QgsRendererRangeV2LabelFormat()
self.assertTrue(format, "QgsRendererRangeV2LabelFomat construction failed")
template = "%1 - %2 metres"
template = "%1 - %2 meters"
precision = 5
format.setFormat(template)
self.assertEqual(format.format(), template, "Format getter/setter failed")
@@ -249,8 +249,8 @@ def testQgsRendererRangeV2LabelFormat_2(self):
("%2", "2.34"),
("%2%", "2.34%"),
("%1%1", "1.231.23"),
("from %1 to %2 metres", "from 1.23 to 2.34 metres"),
("from %2 to %1 metres", "from 2.34 to 1.23 metres"),
("from %1 to %2 meters", "from 1.23 to 2.34 meters"),
("from %2 to %1 meters", "from 2.34 to 1.23 meters"),
)
format.setPrecision(2)
format.setTrimTrailingZeroes(False)

0 comments on commit f3c7ab6

Please sign in to comment.
You can’t perform that action at this time.