Commit34a8ed3

authored

Merge pull request#360 from python/dont_sort_dict

remove the requirement to sort the dict file.

2 parentsd7c9255 +50e9efd commit34a8ed3Copy full SHA for 34a8ed3

File tree

4 files changed

+16

-26

lines changed

4 files changed

+16

-26

lines changed

`‎.pre-commit-config.yaml`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,3 @@ repos:`
`9`	`9`	`hooks:`
`10`	`10`	`-id:pospell`
`11`	`11`	`args:['--personal-dict', 'dict', '--modified', '--language', 'es_ES', '--language', 'es_AR']`
`12`		`--repo:https://github.com/pre-commit/pre-commit-hooks`
`13`		`-rev:v2.5.0`
`14`		`-hooks:`
`15`		`- -id:file-contents-sorter`
`16`		`-files:dict`

`‎.travis.yml`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ install:`
`11`	`11`	`script:`
`12`	`12`	`-powrap --check --quiet */.po`
`13`	`13`	`-pospell -p dict -l es_AR -l es_ES */.po`
	`14`	`+ -make dict_dups`
`14`	`15`	`-make build`
`15`	`16`	`branches:`
`16`	`17`	`only:`

`‎Makefile`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ help:`
`31`	`31`	`@echo" spell Check spelling"`
`32`	`32`	`@echo" wrap Wrap all the PO files to a fixed column width"`
`33`	`33`	`@echo" progress To compute current progression on the tutorial"`
	`34`	`+@echo" dict_dupsCheck duplicated entries on the dict"`
`34`	`35`	`@echo""`
`35`	`36`
`36`	`37`
`@@ -94,3 +95,17 @@ spell: venv`
`94`	`95`	`.PHONY: wrap`
`95`	`96`	`wrap: venv`
`96`	`97`	`$(VENV)/bin/powrap*/.po`
	`98`	`+`
	`99`	`+.PHONY: dict_dups`
	`100`	`+SHELL:=/bin/bash`
	`101`	`+.ONESHELL:`
	`102`	`+dict_dups:`
	`103`	`+if [[$$(cat dict\| sort\| uniq -dc) ]]; then\`
	`104`	`+echo -e"\n\n\n ####################### \n\n\n"`
	`105`	`+echo"duplicated lines in the dict file"`
	`106`	`+uniq -dc dict`
	`107`	`+exit 1`
	`108`	`+else`
	`109`	`+echo"no duplicated lines"`
	`110`	`+exit 0`
	`111`	`+fi`

`‎dict`

Lines changed: 0 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ Cookbook`
`26`	`26`	`Ctrl`
`27`	`27`	`Cython`
`28`	`28`	`Distutils`
`29`		`-Distutils`
`30`	`29`	`FLTK`
`31`	`30`	`Fibonacci`
`32`	`31`	`Finder`
`@@ -42,7 +41,6 @@ Gtk+`
`42`	`41`	`HTML`
`43`	`42`	`Hammond`
`44`	`43`	`Hat`
`45`		`-Hat`
`46`	`44`	`Henstridge`
`47`	`45`	`Hewlett`
`48`	`46`	`Hugunin`
`@@ -66,7 +64,6 @@ Mac`
`66`	`64`	`MacOS`
`67`	`65`	`Macintosh`
`68`	`66`	`Mandrake`
`69`		`-Mandrake`
`70`	`67`	`Mark`
`71`	`68`	`Microsoft`
`72`	`69`	`Mitch`
`@@ -106,10 +103,8 @@ SciPy`
`106`	`103`	`SimpleFileExFlags`
`107`	`104`	`Smalltalk`
`108`	`105`	`Solaris`
`109`		`-Solaris`
`110`	`106`	`Spot`
`111`	`107`	`Stein`
`112`		`-subdirectorios`
`113`	`108`	`TCP`
`114`	`109`	`Tcl`
`115`	`110`	`Tix`
`@@ -144,7 +139,6 @@ backspace`
`144`	`139`	`bash`
`145`	`140`	`batch`
`146`	`141`	`bdist`
`147`		`-bdist`
`148`	`142`	`big-endian`
`149`	`143`	`bloqueante`
`150`	`144`	`booleano`
`@@ -183,14 +177,11 @@ criptográficamente`
`183`	`177`	`curses`
`184`	`178`	`customización`
`185`	`179`	`customizarlo`
`186`		`-códec`
`187`	`180`	`datagramas`
`188`	`181`	`debugueando`
`189`	`182`	`default`
`190`	`183`	`desasignar`
`191`		`-descompresor`
`192`	`184`	`deserialización`
`193`		`-deserializar`
`194`	`185`	`desreferenciar`
`195`	`186`	`desalojable`
`196`	`187`	`desambiguar`
`@@ -203,11 +194,7 @@ descargable`
`203`	`194`	`desasignarán`
`204`	`195`	`desasignador`
`205`	`196`	`desasignadores`
`206`		`-descargable`
`207`		`-desasignada`
`208`		`-descargable`
`209`	`197`	`descompresor`
`210`		`-deserialización`
`211`	`198`	`deserializar`
`212`	`199`	`desinstalador`
`213`	`200`	`designadores`
`@@ -342,28 +329,21 @@ naif`
`342`	`329`	`nonlocal`
`343`	`330`	`object`
`344`	`331`	`obsérvese`
`345`		`-option`
`346`	`332`	`or`
`347`	`333`	`ordenables`
`348`	`334`	`path`
`349`	`335`	`pathlib`
`350`	`336`	`multiprocesamiento`
`351`	`337`	`mutex`
`352`	`338`	`mxBase`
`353`		`-mxBase`
`354`	`339`	`naíf`
`355`	`340`	`naífs`
`356`	`341`	`ncurses`
`357`		`-nonlocal`
`358`	`342`	`normalización`
`359`		`-object`
`360`	`343`	`operando`
`361`		`-operandos`
`362`	`344`	`onexit`
`363`		`-operandos`
`364`	`345`	`option`
`365`	`346`	`operandos`
`366`		`-or`
`367`	`347`	`os`
`368`	`348`	`pads`
`369`	`349`	`parsea`
`@@ -439,7 +419,6 @@ script`
`439`	`419`	`scripting`
`440`	`420`	`scripts`
`441`	`421`	`sdux`
`442`		`-sdux`
`443`	`422`	`search`
`444`	`423`	`secuencialmente`
`445`	`424`	`seguirle`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit34a8ed3

File tree

4 files changed

4 files changed

`‎.pre-commit-config.yaml`

`‎.travis.yml`

`‎Makefile`

`‎dict`

0 commit comments