Skip to content

Commit 487a7a0

Browse files
jef-njef-n
committedAug 6, 2017
fix 'allows to/allows one to' spell errors and enhance to our spellchecker to deal with those
·
ltr-3_40final-3_0_0
1 parent 771bceb commit 487a7a0

19 files changed

+61
-51
lines changed
 

‎python/core/qgscoordinatereferencesystem.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class QgsCoordinateReferenceSystem
110110
Sometimes it happens that users need to use a CRS definition that is not well known
111111
or that has been only created with a specific purpose (and thus its definition is not
112112
available in our database of CRS). Whenever a new CRS definition is seen, it will
113-
be added to the local databse (in user's home directory, see QgsApplication.qgisUserDatabaseFilePath()).
113+
be added to the local database (in user's home directory, see QgsApplication.qgisUserDatabaseFilePath()).
114114
QGIS also features a GUI for management of local custom CRS definitions.
115115

116116
There are therefore two databases: one for shipped CRS definitions and one for custom CRS definitions.

‎python/core/symbology/qgscategorizedsymbolrenderer.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ create renderer from XML element
224224
void setDataDefinedSizeLegend( QgsDataDefinedSizeLegend *settings /Transfer/ );
225225
%Docstring
226226
Configures appearance of legend when renderer is configured to use data-defined size for marker symbols.
227-
This allows to configure for what values (symbol sizes) should be shown in the legend, whether to display
227+
This allows configuring for which values (symbol sizes) should be shown in the legend, whether to display
228228
different symbol sizes collapsed in one legend node or separated across multiple legend nodes etc.
229229

230230
When renderer does not use data-defined size or does not use marker symbols, these settings will be ignored.

‎python/core/symbology/qgsgraduatedsymbolrenderer.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ create renderer from XML element
409409
void setDataDefinedSizeLegend( QgsDataDefinedSizeLegend *settings /Transfer/ );
410410
%Docstring
411411
Configures appearance of legend when renderer is configured to use data-defined size for marker symbols.
412-
This allows to configure for what values (symbol sizes) should be shown in the legend, whether to display
412+
This allows configuring for which values (symbol sizes) should be shown in the legend, whether to display
413413
different symbol sizes collapsed in one legend node or separated across multiple legend nodes etc.
414414

415415
When renderer does not use data-defined size or does not use marker symbols, these settings will be ignored.

‎python/core/symbology/qgssinglesymbolrenderer.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ create renderer from XML element
6363
void setDataDefinedSizeLegend( QgsDataDefinedSizeLegend *settings /Transfer/ );
6464
%Docstring
6565
Configures appearance of legend when renderer is configured to use data-defined size for marker symbols.
66-
This allows to configure for what values (symbol sizes) should be shown in the legend, whether to display
66+
This allow to configure for which values (symbol sizes) should be shown in the legend, whether to display
6767
different symbol sizes collapsed in one legend node or separated across multiple legend nodes etc.
6868

6969
When renderer does not use data-defined size or does not use marker symbols, these settings will be ignored.

‎python/gui/qgscheckablecombobox.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class QgsCheckableComboBox : QComboBox
133133

134134
void showContextMenu( const QPoint &pos );
135135
%Docstring
136-
Display context menu which allows to select/deselect
136+
Display context menu which allows selecting/deselecting
137137
all items at once.
138138
%End
139139

‎python/gui/qgsmaptooledit.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Returns fill color for rubber bands (from global settings)
5454
the QGIS settings. The caller takes ownership of the
5555
returned object
5656
\param geometryType
57-
\param alternativeBand if true, rubber band will be set with more transparency and a dash pattern. defaut is false.
57+
\param alternativeBand if true, rubber band will be set with more transparency and a dash pattern. default is false.
5858
:rtype: QgsRubberBand
5959
%End
6060

‎python/plugins/processing/algs/help/qgis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ qgis:randomselectionwithinsubsets: >
451451
The percentage/count value is not applied to the whole layer, but instead to each category. Categories are defined according to a given attribute, which is also specified as an input parameter for the algorithm.
452452

453453
qgis:rastercalculator: >
454-
This algorithm allows to perform algebraic operations using raster layers.
454+
This algorithm allows performing algebraic operations using raster layers.
455455

456456
The resulting layer will have its values computed according to an expression. The expression can contain numerical values, operators and references to any of the layers in the current project. The following functions are also supported:
457457

‎python/plugins/processing/algs/help/saga.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
saga:rastercalculator: >
2-
This algorithm allows to perform algebraic operations on raster layers
2+
This algorithm allows performing algebraic operations on raster layers
33

44
It requires a base layer, and a set of additional layers. The base layer is identified as "a" in the formula, while the additional layers are identified as "b, c, d...", using the order in which they appear in the multiple selection dialog.
55

@@ -45,4 +45,4 @@ saga:rastercalculator: >
4545

4646
- eq(x,y): true if x equals y. When using this function SAGA evaluates it in a per–cell basis. Therefore, eq(a,b) will not return 1 if grid a equals grid b. It will return 1 for those cells that have the same value in both grids, and zero otherwise.
4747

48-
- ifelse(condition, x, y) returns x if condition evaluates to true (condition=1) or y if it evaluates to false
48+
- ifelse(condition, x, y) returns x if condition evaluates to true (condition=1) or y if it evaluates to false

‎scripts/spell_check/check_spelling.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,10 @@ for I in $(seq -f '%02g' 0 $(($SPLIT-1)) ) ; do
175175
CORRECTION=$(ag --nonumbers --case-sensitive "^${ERRORSMALLCASE}:" ${DIR}/spelling.dat | cut -d: -f2)
176176

177177
if [[ -z $CORRECTION ]]; then
178+
CORRECTION=$(perl -e "use strict; use warnings; while(<>) { chop; my(\$a,\$b) = split /:/; \$a = qr(\$a); if( my @matches = '${ERRORSMALLCASE}' =~ /^\$a\$/i ) { print sprintf(\$b, @matches); last; }}" ${DIR}/spelling.dat)
179+
fi
180+
181+
if [[ -z "$CORRECTION" ]]; then
178182
echo "could not find correction for $ERROR" >&2
179183
else
180184
# Match case

‎scripts/spell_check/spelling.dat

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,11 @@ alliviate:alleviate
388388
allmost:almost
389389
allopone:allophone
390390
allopones:allophones
391+
allow one to (\S+):allow %sing
392+
allow to (\S+):allow %sing
391393
allowd:allowed:*
394+
allows one to (\S+):allows %sing
395+
allows to (\S+):allows %sing
392396
allpication:application
393397
allready:already
394398
allthough:although
@@ -622,9 +626,9 @@ archtype:archetype
622626
archtypes:archetypes
623627
archvie:archive
624628
archvies:archives
629+
are'nt:aren't
625630
aready:already
626631
arent:aren't
627-
are'nt:aren't
628632
areodynamics:aerodynamics
629633
argment:argument
630634
argments:arguments
@@ -1138,10 +1142,10 @@ casues:causes
11381142
casuing:causing
11391143
casulaties:casualties
11401144
casulaty:casualty
1141-
catalogue:catalog
11421145
catagories:categories
11431146
catagorized:categorized
11441147
catagory:category
1148+
catalogue:catalog
11451149
catched:caught
11461150
catepillar:caterpillar
11471151
catepillars:caterpillars
@@ -1235,8 +1239,8 @@ chcek:check
12351239
chceked:checked
12361240
chceking:checking
12371241
chceks:checks
1238-
check-box:checkbox
12391242
check box:checkbox
1243+
check-box:checkbox
12401244
checkk:check
12411245
checksuming:checksumming
12421246
cheif:chief
@@ -1302,6 +1306,7 @@ clipoing:clipping
13021306
closeing:closing
13031307
cmoputer:computer
13041308
cna:can
1309+
co-incided:coincided
13051310
Coca Cola:Coca-Cola
13061311
coctail:cocktail
13071312
codespel:codespell
@@ -1314,7 +1319,6 @@ cofiguring:configuring
13141319
coform:conform
13151320
cognizent:cognizant
13161321
coincedentally:coincidentally
1317-
co-incided:coincided
13181322
colaboration:collaboration
13191323
colaborations:collaborations
13201324
colateral:collateral
@@ -1877,10 +1881,12 @@ dacquiri:daiquiri
18771881
daed:dead
18781882
dael:deal
18791883
dafault:default
1884+
dafaut:default
18801885
dalmation:dalmatian
18811886
damenor:demeanor
18821887
dammage:damage
18831888
Dardenelles:Dardanelles
1889+
databse:database
18841890
daugher:daughter
18851891
deafault:default
18861892
deafult:default
@@ -2170,9 +2176,9 @@ dictionarys:dictionaries:*
21702176
dictionay:dictionary
21712177
dictionnary:dictionary
21722178
dicussed:discussed
2173-
didnt:didn't
2174-
didnt':didn't
21752179
did'nt:didn't
2180+
didnt':didn't
2181+
didnt:didn't
21762182
diea:idea
21772183
dieing:dying
21782184
dieties:deities
@@ -2346,6 +2352,7 @@ divison:division
23462352
divisons:divisions
23472353
divsion:division
23482354
divsions:divisions
2355+
do'nt:don't
23492356
doccument:document
23502357
doccumented:documented
23512358
doccuments:documents
@@ -2363,14 +2370,14 @@ documention:documentation
23632370
documetation:documentation
23642371
documment:document
23652372
documments:documents
2366-
doens:does
23672373
doens't:doesn't
2374+
doens:does
2375+
does'nt:doesn't
2376+
does't:doesn't
23682377
doesen't:doesn't
2369-
doesnt:doesn't
23702378
doesnt':doesn't
2371-
does'nt:doesn't
23722379
doesnt't:doesn't
2373-
does't:doesn't
2380+
doesnt:doesn't
23742381
doign:doing
23752382
doman:domain
23762383
domans:domains
@@ -2379,20 +2386,19 @@ dominent:dominant
23792386
dominiant:dominant
23802387
donig:doing
23812388
donnot:do not
2382-
dont:don't
23832389
dont':don't
2384-
do'nt:don't
23852390
dont't:don't
2391+
dont:don't
23862392
donwload:download
23872393
donwloaded:downloaded
23882394
donwloading:downloading
23892395
donwloads:downloads
2390-
dosent':doesn't
23912396
dosen't:doesn't
2397+
dosent':doesn't
23922398
doub:doubt
2393-
doulbe:double
23942399
double click:double-click
23952400
doubleclick:double-click
2401+
doulbe:double
23962402
dowloads:downloads
23972403
downlad:download
23982404
downlads:downloads
@@ -2943,13 +2949,13 @@ fiel:field
29432949
fiels:fields
29442950
fiercly:fiercely
29452951
fightings:fighting
2946-
fille:file
2947-
filles:files
29482952
filesytem:filesystem
29492953
filesytems:filesystems
29502954
fileystem:filesystem
29512955
fileystems:filesystems
29522956
filiament:filament
2957+
fille:file
2958+
filles:files
29532959
fimilies:families
29542960
finacial:financial
29552961
finaly:finally
@@ -3286,12 +3292,12 @@ harrassing:harassing
32863292
harrassment:harassment
32873293
harrassments:harassments
32883294
harware:hardware
3289-
hasnt:hasn't
3290-
hasnt':hasn't
32913295
has'nt:hasn't
3296+
hasnt':hasn't
3297+
hasnt:hasn't
32923298
Hatian:Haitian
3293-
havent:haven't
32943299
have'nt:haven't
3300+
havent:haven't
32953301
haviest:heaviest
32963302
havn't:haven't
32973303
hazzle:hassle
@@ -3817,6 +3823,7 @@ inprisonment:imprisonment
38173823
inproper:improper:*
38183824
inproperly:improperly
38193825
inproving:improving
3826+
ins't:isn't
38203827
inscpeting:inspecting
38213828
insde:inside
38223829
insectiverous:insectivorous
@@ -3829,7 +3836,6 @@ insistance:insistence
38293836
insitution:institution
38303837
insitutions:institutions
38313838
inspite:in spite
3832-
ins't:isn't
38333839
instade:instead
38343840
instalation:installation
38353841
instalations:installations
@@ -4010,9 +4016,9 @@ irrelevent:irrelevant
40104016
irreplacable:irreplaceable
40114017
irresistable:irresistible
40124018
irresistably:irresistibly
4013-
isnt:isn't
4014-
isnt':isn't
40154019
is'nt:isn't
4020+
isnt':isn't
4021+
isnt:isn't
40164022
isntance:instance
40174023
isntances:instances
40184024
Israelies:Israelis
@@ -4253,7 +4259,6 @@ manisfestations:manifestations
42534259
mannor:manner
42544260
mannual:manual
42554261
mannually:manually
4256-
manualy:manually
42574262
manoeuverability:maneuverability
42584263
manoeuvering:maneuvering
42594264
manoeuvre:maneuver
@@ -4267,6 +4272,7 @@ mantained:maintained
42674272
mantainer:maintainer
42684273
mantaining:maintaining
42694274
mantains:maintains
4275+
manualy:manually
42704276
manuever:maneuver
42714277
manuevers:maneuvers
42724278
manufacturedd:manufactured
@@ -4673,6 +4679,7 @@ nusance:nuisance
46734679
nutritent:nutrient
46744680
nutritents:nutrients
46754681
nuturing:nurturing
4682+
o'caml:OCaml
46764683
obediance:obedience
46774684
obediant:obedient
46784685
obession:obsession
@@ -4682,7 +4689,6 @@ obstacal:obstacle
46824689
obstancles:obstacles
46834690
obstruced:obstructed
46844691
obsure:obscure
4685-
o'caml:OCaml
46864692
ocasion:occasion
46874693
ocasional:occasional
46884694
ocasionally:occasionally
@@ -5166,8 +5172,8 @@ porshon:portion
51665172
portait:portrait
51675173
portayed:portrayed
51685174
portraing:portraying
5169-
portugese:Portuguese
51705175
Portugese:Portuguese
5176+
portugese:Portuguese
51715177
portuguease:portuguese
51725178
portugues:Portuguese
51735179
posess:possess
@@ -6271,10 +6277,10 @@ shortwhile:short while
62716277
shoud:should
62726278
shoudl:should
62736279
shoudln: shouldn't
6274-
shouldnt:shouldn't
6275-
shouldnt':shouldn't
62766280
should'nt:shouldn't
62776281
should't:shouldn't
6282+
shouldnt':shouldn't
6283+
shouldnt:shouldn't
62786284
shoule:should
62796285
shreak:shriek
62806286
shrinked:shrunk
@@ -6752,14 +6758,14 @@ syles:styles
67526758
sylog:syslog
67536759
symbo:symbol
67546760
symboll:symbol
6755-
symobl:symbol
67566761
symetric:symmetric
67576762
symetrical:symmetrical
67586763
symetrically:symmetrically
67596764
symetry:symmetry
67606765
symettric:symmetric
67616766
symmetral:symmetric
67626767
symmetricaly:symmetrically
6768+
symobl:symbol
67636769
synagouge:synagogue
67646770
synax:syntax
67656771
synchonisation:synchronisation
@@ -7432,8 +7438,8 @@ vulnerablility:vulnerability
74327438
vyer:very
74337439
vyre:very
74347440
waht:what
7435-
wanna:want to
74367441
wan't:want
7442+
wanna:want to
74377443
want's:wants
74387444
warantee:warranty
74397445
waranties:warranties
@@ -7442,9 +7448,9 @@ wardobe:wardrobe
74427448
waring:warning
74437449
warrent:warrant
74447450
warrriors:warriors
7445-
wasnt:wasn't
7446-
wasnt':wasn't
74477451
was'nt:weren't
7452+
wasnt':wasn't
7453+
wasnt:wasn't
74487454
wass:was
74497455
watn:want
74507456
wayword:wayward
@@ -7458,8 +7464,8 @@ weill:will
74587464
weired:weird
74597465
wendsay:Wednesday
74607466
wensday:Wednesday
7461-
wereabouts:whereabouts
74627467
were'nt:wasn't
7468+
wereabouts:whereabouts
74637469
werent:weren't
74647470
wether:whether
74657471
whant:want
@@ -7531,9 +7537,9 @@ worstened:worsened
75317537
woud:would
75327538
woudl:would
75337539
woudn't:wouldn't
7534-
wouldnt:wouldn't
75357540
would'nt:wouldn't
75367541
would't:wouldn't
7542+
wouldnt:wouldn't
75377543
wresters:wrestlers
75387544
wriet:write
75397545
writeable:writable

‎src/core/layertree/qgslayertreemodel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ class CORE_EXPORT QgsLayerTreeModel : public QAbstractItemModel
354354
LayerLegendTree *tryBuildLegendTree( const QList<QgsLayerTreeModelLegendNode *> &nodes ) SIP_SKIP;
355355

356356
//! Overrides of map layers' styles: key = layer ID, value = style XML.
357-
//! This allows to show legend that is different from the current style of layers
357+
//! This allows showing a legend that is different from the current style of layers
358358
QMap<QString, QString> mLayerStyleOverrides;
359359

360360
//! Per layer data about layer's legend nodes

‎src/core/qgscoordinatereferencesystem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ typedef void ( *CUSTOM_CRS_VALIDATION )( QgsCoordinateReferenceSystem & ) SIP_SK
142142
* Sometimes it happens that users need to use a CRS definition that is not well known
143143
* or that has been only created with a specific purpose (and thus its definition is not
144144
* available in our database of CRS). Whenever a new CRS definition is seen, it will
145-
* be added to the local databse (in user's home directory, see QgsApplication::qgisUserDatabaseFilePath()).
145+
* be added to the local database (in user's home directory, see QgsApplication::qgisUserDatabaseFilePath()).
146146
* QGIS also features a GUI for management of local custom CRS definitions.
147147
*
148148
* There are therefore two databases: one for shipped CRS definitions and one for custom CRS definitions.

‎src/core/symbology/qgscategorizedsymbolrenderer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ class CORE_EXPORT QgsCategorizedSymbolRenderer : public QgsFeatureRenderer
183183

184184
/**
185185
* Configures appearance of legend when renderer is configured to use data-defined size for marker symbols.
186-
* This allows to configure for what values (symbol sizes) should be shown in the legend, whether to display
186+
* This allows configuring for which values (symbol sizes) should be shown in the legend, whether to display
187187
* different symbol sizes collapsed in one legend node or separated across multiple legend nodes etc.
188188
*
189189
* When renderer does not use data-defined size or does not use marker symbols, these settings will be ignored.

‎src/core/symbology/qgsgraduatedsymbolrenderer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ class CORE_EXPORT QgsGraduatedSymbolRenderer : public QgsFeatureRenderer
334334

335335
/**
336336
* Configures appearance of legend when renderer is configured to use data-defined size for marker symbols.
337-
* This allows to configure for what values (symbol sizes) should be shown in the legend, whether to display
337+
* This allows configuring for which values (symbol sizes) should be shown in the legend, whether to display
338338
* different symbol sizes collapsed in one legend node or separated across multiple legend nodes etc.
339339
*
340340
* When renderer does not use data-defined size or does not use marker symbols, these settings will be ignored.

‎src/core/symbology/qgssinglesymbolrenderer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class CORE_EXPORT QgsSingleSymbolRenderer : public QgsFeatureRenderer
6666

6767
/**
6868
* Configures appearance of legend when renderer is configured to use data-defined size for marker symbols.
69-
* This allows to configure for what values (symbol sizes) should be shown in the legend, whether to display
69+
* This allow to configure for which values (symbol sizes) should be shown in the legend, whether to display
7070
* different symbol sizes collapsed in one legend node or separated across multiple legend nodes etc.
7171
*
7272
* When renderer does not use data-defined size or does not use marker symbols, these settings will be ignored.

‎src/gui/editorwidgets/core/qgseditorwidgetautoconf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class GUI_EXPORT QgsEditorWidgetAutoConfPlugin
5252
///@cond PRIVATE
5353

5454
/** \ingroup gui
55-
* Class that allows to register plugins to pick automatically a widget type for editing fields.
55+
* Class that allows registing plugins to pick automatically a widget type for editing fields.

Comment on line R55

nyalldawson commented on Aug 6, 2017

@nyalldawson
nyalldawson
on Aug 6, 2017
Collaborator

registing?

Code has comments. Press enter to view.
5656
* This class has only one instance, owned by the QgsEditorWidgetRegistry singleton
5757
*
5858
* The plugins are instances of QgsEditorWidgetAutoConfPlugin.

‎src/gui/qgscheckablecombobox.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ class GUI_EXPORT QgsCheckableComboBox : public QComboBox
208208

209209
protected slots:
210210

211-
/** Display context menu which allows to select/deselect
211+
/** Display context menu which allows selecting/deselecting
212212
* all items at once.
213213
*/
214214
void showContextMenu( const QPoint &pos );

‎src/gui/qgsmaptooledit.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class GUI_EXPORT QgsMapToolEdit: public QgsMapTool
5656
* the QGIS settings. The caller takes ownership of the
5757
* returned object
5858
* \param geometryType
59-
* \param alternativeBand if true, rubber band will be set with more transparency and a dash pattern. defaut is false.
59+
* \param alternativeBand if true, rubber band will be set with more transparency and a dash pattern. default is false.
6060
*/
6161
QgsRubberBand *createRubberBand( QgsWkbTypes::GeometryType geometryType = QgsWkbTypes::LineGeometry, bool alternativeBand = false ) SIP_FACTORY;
6262

‎src/plugins/evis/databaseconnection/evisdatabaseconnection.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class eVisDatabaseConnection
5656
//! \brief Constructor
5757
eVisDatabaseConnection( const QString &, int, const QString &, const QString &, const QString &, DatabaseType );
5858

59-
//! \brief Public method that finalizes a connection to a databse
59+
//! \brief Public method that finalizes a connection to a database
6060
bool connect();
6161

6262
//! \brief Public method that passes an SQL statement to the database for execution

0 commit comments

Comments
 (0)
Please sign in to comment.