fix 'allows to/allows one to' spell errors and enhance to our spellch…

…ecker to deal with those
qgis · Aug 6, 2017 · 487a7a0 · 487a7a0
1 parent 771bceb
commit 487a7a0
Show file tree

Hide file tree

Showing 19 changed files with 61 additions and 51 deletions.
diff --git a/python/core/qgscoordinatereferencesystem.sip b/python/core/qgscoordinatereferencesystem.sip
@@ -110,7 +110,7 @@ class QgsCoordinateReferenceSystem
  Sometimes it happens that users need to use a CRS definition that is not well known
  or that has been only created with a specific purpose (and thus its definition is not
  available in our database of CRS). Whenever a new CRS definition is seen, it will
- be added to the local databse (in user's home directory, see QgsApplication.qgisUserDatabaseFilePath()).
+ be added to the local database (in user's home directory, see QgsApplication.qgisUserDatabaseFilePath()).
  QGIS also features a GUI for management of local custom CRS definitions.
 
  There are therefore two databases: one for shipped CRS definitions and one for custom CRS definitions.

diff --git a/python/core/symbology/qgscategorizedsymbolrenderer.sip b/python/core/symbology/qgscategorizedsymbolrenderer.sip
@@ -224,7 +224,7 @@ create renderer from XML element
     void setDataDefinedSizeLegend( QgsDataDefinedSizeLegend *settings /Transfer/ );
 %Docstring
  Configures appearance of legend when renderer is configured to use data-defined size for marker symbols.
- This allows to configure for what values (symbol sizes) should be shown in the legend, whether to display
+ This allows configuring for which values (symbol sizes) should be shown in the legend, whether to display
  different symbol sizes collapsed in one legend node or separated across multiple legend nodes etc.
 
  When renderer does not use data-defined size or does not use marker symbols, these settings will be ignored.

diff --git a/python/core/symbology/qgsgraduatedsymbolrenderer.sip b/python/core/symbology/qgsgraduatedsymbolrenderer.sip
@@ -409,7 +409,7 @@ create renderer from XML element
     void setDataDefinedSizeLegend( QgsDataDefinedSizeLegend *settings /Transfer/ );
 %Docstring
  Configures appearance of legend when renderer is configured to use data-defined size for marker symbols.
- This allows to configure for what values (symbol sizes) should be shown in the legend, whether to display
+ This allows configuring for which values (symbol sizes) should be shown in the legend, whether to display
  different symbol sizes collapsed in one legend node or separated across multiple legend nodes etc.
 
  When renderer does not use data-defined size or does not use marker symbols, these settings will be ignored.

diff --git a/python/core/symbology/qgssinglesymbolrenderer.sip b/python/core/symbology/qgssinglesymbolrenderer.sip
@@ -63,7 +63,7 @@ create renderer from XML element
     void setDataDefinedSizeLegend( QgsDataDefinedSizeLegend *settings /Transfer/ );
 %Docstring
  Configures appearance of legend when renderer is configured to use data-defined size for marker symbols.
- This allows to configure for what values (symbol sizes) should be shown in the legend, whether to display
+ This allow to configure for which values (symbol sizes) should be shown in the legend, whether to display
  different symbol sizes collapsed in one legend node or separated across multiple legend nodes etc.
 
  When renderer does not use data-defined size or does not use marker symbols, these settings will be ignored.

diff --git a/python/gui/qgscheckablecombobox.sip b/python/gui/qgscheckablecombobox.sip
@@ -133,7 +133,7 @@ class QgsCheckableComboBox : QComboBox
 
     void showContextMenu( const QPoint &pos );
 %Docstring
- Display context menu which allows to select/deselect
+ Display context menu which allows selecting/deselecting
  all items at once.
 %End
 

diff --git a/python/gui/qgsmaptooledit.sip b/python/gui/qgsmaptooledit.sip
@@ -54,7 +54,7 @@ Returns fill color for rubber bands (from global settings)
    the QGIS settings. The caller takes ownership of the
    returned object
    \param geometryType
-   \param alternativeBand if true, rubber band will be set with more transparency and a dash pattern. defaut is false.
+   \param alternativeBand if true, rubber band will be set with more transparency and a dash pattern. default is false.
  :rtype: QgsRubberBand
 %End
 

diff --git a/python/plugins/processing/algs/help/qgis.yaml b/python/plugins/processing/algs/help/qgis.yaml
@@ -451,7 +451,7 @@ qgis:randomselectionwithinsubsets: >
   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.
 
 qgis:rastercalculator: >
-  This algorithm allows to perform algebraic operations using raster layers.
+  This algorithm allows performing algebraic operations using raster layers.
 
   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:
 

diff --git a/python/plugins/processing/algs/help/saga.yaml b/python/plugins/processing/algs/help/saga.yaml
@@ -1,5 +1,5 @@
 saga:rastercalculator: >
-  This algorithm allows to perform algebraic operations on raster layers
+  This algorithm allows performing algebraic operations on raster layers
 
   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.
 
@@ -45,4 +45,4 @@ saga:rastercalculator: >
 
   - 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.
 
-  - ifelse(condition, x, y) returns x if condition evaluates to true (condition=1) or y if it evaluates to false
+  - ifelse(condition, x, y) returns x if condition evaluates to true (condition=1) or y if it evaluates to false
diff --git a/scripts/spell_check/check_spelling.sh b/scripts/spell_check/check_spelling.sh
@@ -175,6 +175,10 @@ for I in $(seq -f '%02g' 0  $(($SPLIT-1)) ) ; do
         CORRECTION=$(ag --nonumbers --case-sensitive "^${ERRORSMALLCASE}:" ${DIR}/spelling.dat | cut -d: -f2)
 
         if [[ -z $CORRECTION ]]; then
+          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)
+        fi
+
+        if [[ -z "$CORRECTION" ]]; then
           echo "could not find correction for $ERROR" >&2
         else
           # Match case

diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat
@@ -388,7 +388,11 @@ alliviate:alleviate
 allmost:almost
 allopone:allophone
 allopones:allophones
+allow one to (\S+):allow %sing
+allow to (\S+):allow %sing
 allowd:allowed:*
+allows one to (\S+):allows %sing
+allows to (\S+):allows %sing
 allpication:application
 allready:already
 allthough:although
@@ -622,9 +626,9 @@ archtype:archetype
 archtypes:archetypes
 archvie:archive
 archvies:archives
+are'nt:aren't
 aready:already
 arent:aren't
-are'nt:aren't
 areodynamics:aerodynamics
 argment:argument
 argments:arguments
@@ -1138,10 +1142,10 @@ casues:causes
 casuing:causing
 casulaties:casualties
 casulaty:casualty
-catalogue:catalog
 catagories:categories
 catagorized:categorized
 catagory:category
+catalogue:catalog
 catched:caught
 catepillar:caterpillar
 catepillars:caterpillars
@@ -1235,8 +1239,8 @@ chcek:check
 chceked:checked
 chceking:checking
 chceks:checks
-check-box:checkbox
 check box:checkbox
+check-box:checkbox
 checkk:check
 checksuming:checksumming
 cheif:chief
@@ -1302,6 +1306,7 @@ clipoing:clipping
 closeing:closing
 cmoputer:computer
 cna:can
+co-incided:coincided
 Coca Cola:Coca-Cola
 coctail:cocktail
 codespel:codespell
@@ -1314,7 +1319,6 @@ cofiguring:configuring
 coform:conform
 cognizent:cognizant
 coincedentally:coincidentally
-co-incided:coincided
 colaboration:collaboration
 colaborations:collaborations
 colateral:collateral
@@ -1877,10 +1881,12 @@ dacquiri:daiquiri
 daed:dead
 dael:deal
 dafault:default
+dafaut:default
 dalmation:dalmatian
 damenor:demeanor
 dammage:damage
 Dardenelles:Dardanelles
+databse:database
 daugher:daughter
 deafault:default
 deafult:default
@@ -2170,9 +2176,9 @@ dictionarys:dictionaries:*
 dictionay:dictionary
 dictionnary:dictionary
 dicussed:discussed
-didnt:didn't
-didnt':didn't
 did'nt:didn't
+didnt':didn't
+didnt:didn't
 diea:idea
 dieing:dying
 dieties:deities
@@ -2346,6 +2352,7 @@ divison:division
 divisons:divisions
 divsion:division
 divsions:divisions
+do'nt:don't
 doccument:document
 doccumented:documented
 doccuments:documents
@@ -2363,14 +2370,14 @@ documention:documentation
 documetation:documentation
 documment:document
 documments:documents
-doens:does
 doens't:doesn't
+doens:does
+does'nt:doesn't
+does't:doesn't
 doesen't:doesn't
-doesnt:doesn't
 doesnt':doesn't
-does'nt:doesn't
 doesnt't:doesn't
-does't:doesn't
+doesnt:doesn't
 doign:doing
 doman:domain
 domans:domains
@@ -2379,20 +2386,19 @@ dominent:dominant
 dominiant:dominant
 donig:doing
 donnot:do not
-dont:don't
 dont':don't
-do'nt:don't
 dont't:don't
+dont:don't
 donwload:download
 donwloaded:downloaded
 donwloading:downloading
 donwloads:downloads
-dosent':doesn't
 dosen't:doesn't
+dosent':doesn't
 doub:doubt
-doulbe:double
 double click:double-click
 doubleclick:double-click
+doulbe:double
 dowloads:downloads
 downlad:download
 downlads:downloads
@@ -2943,13 +2949,13 @@ fiel:field
 fiels:fields
 fiercly:fiercely
 fightings:fighting
-fille:file
-filles:files
 filesytem:filesystem
 filesytems:filesystems
 fileystem:filesystem
 fileystems:filesystems
 filiament:filament
+fille:file
+filles:files
 fimilies:families
 finacial:financial
 finaly:finally
@@ -3286,12 +3292,12 @@ harrassing:harassing
 harrassment:harassment
 harrassments:harassments
 harware:hardware
-hasnt:hasn't
-hasnt':hasn't
 has'nt:hasn't
+hasnt':hasn't
+hasnt:hasn't
 Hatian:Haitian
-havent:haven't
 have'nt:haven't
+havent:haven't
 haviest:heaviest
 havn't:haven't
 hazzle:hassle
@@ -3817,6 +3823,7 @@ inprisonment:imprisonment
 inproper:improper:*
 inproperly:improperly
 inproving:improving
+ins't:isn't
 inscpeting:inspecting
 insde:inside
 insectiverous:insectivorous
@@ -3829,7 +3836,6 @@ insistance:insistence
 insitution:institution
 insitutions:institutions
 inspite:in spite
-ins't:isn't
 instade:instead
 instalation:installation
 instalations:installations
@@ -4010,9 +4016,9 @@ irrelevent:irrelevant
 irreplacable:irreplaceable
 irresistable:irresistible
 irresistably:irresistibly
-isnt:isn't
-isnt':isn't
 is'nt:isn't
+isnt':isn't
+isnt:isn't
 isntance:instance
 isntances:instances
 Israelies:Israelis
@@ -4253,7 +4259,6 @@ manisfestations:manifestations
 mannor:manner
 mannual:manual
 mannually:manually
-manualy:manually
 manoeuverability:maneuverability
 manoeuvering:maneuvering
 manoeuvre:maneuver
@@ -4267,6 +4272,7 @@ mantained:maintained
 mantainer:maintainer
 mantaining:maintaining
 mantains:maintains
+manualy:manually
 manuever:maneuver
 manuevers:maneuvers
 manufacturedd:manufactured
@@ -4673,6 +4679,7 @@ nusance:nuisance
 nutritent:nutrient
 nutritents:nutrients
 nuturing:nurturing
+o'caml:OCaml
 obediance:obedience
 obediant:obedient
 obession:obsession
@@ -4682,7 +4689,6 @@ obstacal:obstacle
 obstancles:obstacles
 obstruced:obstructed
 obsure:obscure
-o'caml:OCaml
 ocasion:occasion
 ocasional:occasional
 ocasionally:occasionally
@@ -5166,8 +5172,8 @@ porshon:portion
 portait:portrait
 portayed:portrayed
 portraing:portraying
-portugese:Portuguese
 Portugese:Portuguese
+portugese:Portuguese
 portuguease:portuguese
 portugues:Portuguese
 posess:possess
@@ -6271,10 +6277,10 @@ shortwhile:short while
 shoud:should
 shoudl:should
 shoudln: shouldn't
-shouldnt:shouldn't
-shouldnt':shouldn't
 should'nt:shouldn't
 should't:shouldn't
+shouldnt':shouldn't
+shouldnt:shouldn't
 shoule:should
 shreak:shriek
 shrinked:shrunk
@@ -6752,14 +6758,14 @@ syles:styles
 sylog:syslog
 symbo:symbol
 symboll:symbol
-symobl:symbol
 symetric:symmetric
 symetrical:symmetrical
 symetrically:symmetrically
 symetry:symmetry
 symettric:symmetric
 symmetral:symmetric
 symmetricaly:symmetrically
+symobl:symbol
 synagouge:synagogue
 synax:syntax
 synchonisation:synchronisation
@@ -7432,8 +7438,8 @@ vulnerablility:vulnerability
 vyer:very
 vyre:very
 waht:what
-wanna:want to
 wan't:want
+wanna:want to
 want's:wants
 warantee:warranty
 waranties:warranties
@@ -7442,9 +7448,9 @@ wardobe:wardrobe
 waring:warning
 warrent:warrant
 warrriors:warriors
-wasnt:wasn't
-wasnt':wasn't
 was'nt:weren't
+wasnt':wasn't
+wasnt:wasn't
 wass:was
 watn:want
 wayword:wayward
@@ -7458,8 +7464,8 @@ weill:will
 weired:weird
 wendsay:Wednesday
 wensday:Wednesday
-wereabouts:whereabouts
 were'nt:wasn't
+wereabouts:whereabouts
 werent:weren't
 wether:whether
 whant:want
@@ -7531,9 +7537,9 @@ worstened:worsened
 woud:would
 woudl:would
 woudn't:wouldn't
-wouldnt:wouldn't
 would'nt:wouldn't
 would't:wouldn't
+wouldnt:wouldn't
 wresters:wrestlers
 wriet:write
 writeable:writable