Skip to content

Commit

Permalink
spelling fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jan 25, 2017
1 parent 49e7b94 commit a64f909
Show file tree
Hide file tree
Showing 8 changed files with 585 additions and 582 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTE.md
Expand Up @@ -13,7 +13,7 @@ by running the prepare commit script **before** issuing `git commit`.

This can be automated by setting up the pre-commit hook properly.

ln -s scripts/prepare-commit.sh .git/hooks/pre-commit
ln -s ../../scripts/prepare-commit.sh .git/hooks/pre-commit

Getting your pull request merged
--------------------------------
Expand Down
2 changes: 1 addition & 1 deletion NEWS
Expand Up @@ -2724,7 +2724,7 @@ July 20, 2002

July 18, 2002
Point, line and polygon PostGis layers can be drawn. Still issues with
map exent and positioning of layers on the canvas. Drawing is manual and
map extent and positioning of layers on the canvas. Drawing is manual and
not tied to the paint event. No zooming or panning yet.

July 10, 2002
Expand Down
2 changes: 1 addition & 1 deletion doc/news.html
Expand Up @@ -3070,7 +3070,7 @@ <H1>28. 0.5</H1>
<P>
July 18, 2002
Point, line and polygon PostGis layers can be drawn. Still issues with
map exent and positioning of layers on the canvas. Drawing is manual and
map extent and positioning of layers on the canvas. Drawing is manual and
not tied to the paint event. No zooming or panning yet.
</P>
<P>
Expand Down
2 changes: 1 addition & 1 deletion doc/news.t2t
Expand Up @@ -2677,7 +2677,7 @@ July 20, 2002

July 18, 2002
Point, line and polygon PostGis layers can be drawn. Still issues with
map exent and positioning of layers on the canvas. Drawing is manual and
map extent and positioning of layers on the canvas. Drawing is manual and
not tied to the paint event. No zooming or panning yet.

July 10, 2002
Expand Down
4 changes: 2 additions & 2 deletions python/gui/qgsmapcanvas.sip
Expand Up @@ -88,9 +88,9 @@ class QgsMapCanvas : QGraphicsView
//! Returns the mapUnitsPerPixel (map units per pixel) for the canvas
double mapUnitsPerPixel() const;

//! Returns the current zoom exent of the map canvas
//! Returns the current zoom extent of the map canvas
QgsRectangle extent() const;
//! Returns the combined exent for all layers on the map canvas
//! Returns the combined extent for all layers on the map canvas
QgsRectangle fullExtent() const;

//! Set the extent of the map canvas
Expand Down
10 changes: 6 additions & 4 deletions scripts/spell_check/check_spelling.sh
Expand Up @@ -30,7 +30,7 @@ if [[ "$OSTYPE" =~ darwin* ]]; then
fi

# ARGUMENTS
INTERACTIVE=YES
INTERACTIVE=$(tty -s && echo YES || echo NO)
DEBUG=NO
OUTPUTLOG=""
while getopts ":rdl:" opt; do
Expand Down Expand Up @@ -79,7 +79,7 @@ declare -A GLOBREP_IGNORE=()
ERRORFOUND=NO

for I in $(seq -f '%02g' 0 $(($SPLIT-1)) ) ; do
printf "Progress: %d/%d\n" $I $SPLIT
[[ "$INTERACTIVE" =~ YES ]] && printf "Progress: %d/%d\n" $I $SPLIT
SPELLFILE=spelling$I~

# if correction contains an uppercase letter and is the same as the error character wise, this means that the error is searched as a full word and case sensitive (not incorporated in a bigger one)
Expand Down Expand Up @@ -268,8 +268,10 @@ for I in $(seq -f '%02g' 0 $(($SPLIT-1)) ) ; do
FILE=""
fi
fi
done 3< <(unbuffer ag --all-text --nopager --color-match "30;43" --numbers --nomultiline --ignore-case -p $AGIGNORE "${IGNORECASE}" $INPUTFILES ; \
unbuffer ag --all-text --nopager --color-match "30;43" --numbers --nomultiline --case-sensitive -p $AGIGNORE "${CASEMATCH}" $INPUTFILES )
done 3< <(
unbuffer ag --all-text --nopager --color-match "30;43" --numbers --nomultiline --ignore-case -p $AGIGNORE "${IGNORECASE}" $INPUTFILES
unbuffer ag --all-text --nopager --color-match "30;43" --numbers --nomultiline --case-sensitive -p $AGIGNORE "${CASEMATCH}" $INPUTFILES
)

rm -f $SPELLFILE
done
Expand Down

0 comments on commit a64f909

Please sign in to comment.