Skip to content

Commit

Permalink
Qual: Spelling outside htdocs (Dolibarr#27448)
Browse files Browse the repository at this point in the history
* Qual: Spelling outside htdocs

# Qual: Fix spelling of files not in the htdocs subdirectory.

Highlight:
- Change in email test from unvalid to invalid that should give the same test result.

* Update Dolibarr-soapui-project.xml

---------

Co-authored-by: Laurent Destailleur <[email protected]>
  • Loading branch information
mdeweerd and eldy authored Jan 12, 2024
1 parent 4cf62b9 commit 42a0d05
Show file tree
Hide file tree
Showing 51 changed files with 104 additions and 104 deletions.
2 changes: 1 addition & 1 deletion build/README
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ See makepack-howto.txt for prerequisites.

--------------------------------------------------------------------------------------------------

- To build developper documentation, launch the script
- To build developer documentation, launch the script
> perl dolibarr-doxygen-build.pl


Expand Down
10 changes: 5 additions & 5 deletions build/debian/README.howto
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export QUILT_PATCHES=debian/patches
# dpkg -l List all packages
# dpkg -b To build binary only package
# dpkg -c package.deb List content of package
# dpkg -I package.deb Give informations on package
# dpkg -I package.deb Give information on package
# dpkg -i package.deb Install a package
# dpkg-reconfigure -plow package Reconfigure package
# dpkg -L packagename List content of installed package
Expand Down Expand Up @@ -173,7 +173,7 @@ or
> ls /srv/chroot

Puis pour se connecter et préparer l'environnement
> schroot -c name_of_chroot (exemple schroot -c unstable-amd64-sbuild)
> schroot -c name_of_chroot (example schroot -c unstable-amd64-sbuild)
> cat /etc/debian_chroot to check which debian branch we are into
> apt-get install vim dialog
> vi /usr/sbin/policy-rc.d and replace return code 101 (not allowed) into 0 (ok)
Expand Down Expand Up @@ -249,7 +249,7 @@ ou
> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-x.y.z]

Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x]
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommitted file
Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
Note: Package is built into directory ../build-area
Note: To compare 2 packages: debdiff package1.dsc package2.dsc
Expand Down Expand Up @@ -345,7 +345,7 @@ To update dolibarr debian package when only files not into debian has changed:

* Checkout the branch you want to work on: master of debian/...
* Manually, add patches into debian/patches and update the file debian/series, or do the 2 steps with "quilt import filepatch.patch"
* You can test patching of serie with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch.
* You can test patching of series with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch.
* Update the debian/changelog to add entry of change.

Once files has been prepared, it's time to test:
Expand All @@ -357,7 +357,7 @@ ou
> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]

Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommitted file
Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
Note: Package is built into directory ../build-area
Note: To compare 2 packages: debdiff package1.dsc package2.dsc
Expand Down
2 changes: 1 addition & 1 deletion build/debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ License: GPL-3+
Files: htdocs/includes/ckeditor/*
Copyright: 2003-2012 CKSource - Frederico Knabben
License: GPL-2+
The ckeditor is tripple licensed under the GNU General Public License (GPL),
The ckeditor is triple licensed under the GNU General Public License (GPL),
GNU Lesser General Public License (LGPL), and Mozilla Public License (MPL).
In Debian, it is distributed under the GNU General Public License (GPL).
.
Expand Down
2 changes: 1 addition & 1 deletion build/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
export DH_VERBOSE=1
export DH_OPTIONS=-v

#export DH_COMPAT=7 # This is the debhelper compatability version to use, now defined into compat file
#export DH_COMPAT=7 # This is the debhelper compatibility version to use, now defined into compat file


%:
Expand Down
2 changes: 1 addition & 1 deletion build/docker/mariadb/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM mariadb:latest
# Enable comented out UTF8 charset/collation options
# Enable commented out UTF8 charset/collation options
RUN sed '/utf8/ s/^#//' /etc/mysql/mariadb.cnf >/tmp/t && mv /tmp/t /etc/mysql/mariadb.cnf
4 changes: 2 additions & 2 deletions build/doxygen/dolibarr-doxygen-build.pl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/perl
#--------------------------------------------------------------------
# Lance la generation de la doc dev doxygen
# Start the generation of the development documentation with doxygen
#--------------------------------------------------------------------

# Detecte repertoire du script
# Determine the patho of this script
($DIR=$0) =~ s/([^\/\\]+)$//;
$DIR||='.';
$DIR =~ s/([^\/\\])[\\\/]+$/$1/;
Expand Down
4 changes: 2 additions & 2 deletions build/doxygen/dolibarr-doxygen.doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,10 @@ TYPEDEF_HIDES_STRUCT = NO
# For small to medium size projects (<1000 input files) the default value is
# probably good enough. For larger projects a too small cache size can cause
# doxygen to be busy swapping symbols to and from disk most of the time
# causing a significant performance penality.
# causing a significant performance penalty.
# If the system has enough physical memory increasing the cache will improve the
# performance by keeping more symbols in memory. Note that the value works on
# a logarithmic scale so increasing the size by one will rougly double the
# a logarithmic scale so increasing the size by one will roughly double the
# memory usage. The cache size is given by this formula:
# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
# corresponding to a cache size of 2^16 = 65536 symbols
Expand Down
2 changes: 1 addition & 1 deletion build/doxygen/doxygen-awesome.css
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ html {
--toc-background: var(--side-nav-background);
--toc-foreground: var(--side-nav-foreground);

/* height of an item in any tree / collapsable table */
/* height of an item in any tree / collapsible table */
--tree-item-height: 30px;

--memname-font-size: var(--code-font-size);
Expand Down
2 changes: 1 addition & 1 deletion build/launchpad/README
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ If you want to build/test package locally:
Use URL pattern (stable):
For stable: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz

- For Dev, you can also add link serie to GIT HEAD.
- For Dev, you can also add link series to GIT HEAD.
- For stable, you can init from command line
cd bzr/dolibarr-stable
bzr init
Expand Down
2 changes: 1 addition & 1 deletion build/makepack-dolibarrtheme.pl
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
if ($CHOOSEDTARGET{$target} < 0) {
print "Package $target not built (bad requirement).\n";
} else {
print "Package $target built succeessfully in $DESTI\n";
print "Package $target built successfully in $DESTI\n";
}
}

Expand Down
6 changes: 3 additions & 3 deletions build/makepack-howto.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Prerequisites to build autoexe DoliWamp package from Linux (solution seems broke
See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
> Add path to ISCC into PATH windows var:
Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded),
> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommended),
open file build/exe/doliwamp.iss and click on button "Compile".
The .exe file will be build into directory build.

Expand Down Expand Up @@ -47,7 +47,7 @@ Prerequisites to build autoexe DoliWamp package from Windows:
This files describe steps made by Dolibarr packaging team to make a
beta version of Dolibarr, step by step.

- Check all files are commited.
- Check all files are committed.
- Update version/info in ChangeLog, for this you can:
To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
To generate a changelog of a major new version x.y.0 (from a repo on branch x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
Expand All @@ -72,7 +72,7 @@ Recopy the content of the output file into the file ChangeLog.
This files describe steps made by Dolibarr packaging team to make a
complete release of Dolibarr, step by step.

- Check all files are commited.
- Check all files are committed.
- Update version/info in ChangeLog, for this you can:
To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
To generate a changelog of a major new version x.y.0 (from a repo pn branch x.y), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
Expand Down
2 changes: 1 addition & 1 deletion build/obs/README
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ OBS:QualityCategory Stable|Testing|Development|Private
For example: https://bugzilla.novell.com/show_bug.cgi?id=848083 to be a maintener of category
https://build.opensuse.org/project/show/Application:ERP
- Once done, go into project, category, subproject and enter a subproject for your application.
Fo example: Dolibarr
For example: Dolibarr
- Then go onto project into your home and ask a publish to the category/you project your created.
2 changes: 1 addition & 1 deletion build/patch/README
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ Building a Patch file
##################################################

This directory contains tools to build a patch after a developer has made changes on files in its Dolibarr tree.
The output patch file can then be submited on Dolibarr dev mailing-list, with explanation on its goal, for inclusion in main branch.
The output patch file can then be submitted on Dolibarr dev mailing-list, with explanation on its goal, for inclusion in main branch.

Using this tool is now deprecated. You must use git pull requests to submit contributions.
6 changes: 3 additions & 3 deletions dev/dolibarr_changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,14 @@ into

* Removed useless directories ("examples", "tools")

* Optionnaly, removed all fonts except
dejavusans* (used by greek, arab, persan, romanian, turkish),
* Optionally, removed all fonts except
dejavusans* (used by greek, arab, person, romanian, turkish),
freemono* (russian),
cid*+msungstdlight+stsongstdlight+uni2cid* (chinese),
helvetica* (all other languages),
zapfdingbats.php (for special chars like form checkboxes)

* Optionnaly, made freemono the default monotype font if we removed courier
* Optionally, made freemono the default monotype font if we removed courier
In htdocs/includes/tecnickcom/tcpdf/tcpdf.php
- protected $default_monospaced_font = 'courier';
+ protected $default_monospaced_font = 'freemono';
Expand Down
4 changes: 2 additions & 2 deletions dev/examples/ical/event_recu.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Example fo recurring event, 1 week, no end, exported by Google
Example for recurring event, 1 week, no end, exported by Google

# The recurring event were recorded every monday the 20150518. This is the Recurrence-id, but then
# first occurrence was moved on tuesday. So this record were added.
Expand Down Expand Up @@ -38,7 +38,7 @@ END:VEVENT



Example fo recurring event, every 2 month, no end, exported by Google
Example for recurring event, every 2 month, no end, exported by Google

BEGIN:VEVENT
DTSTART;TZID=Europe/Paris:20150519T080000
Expand Down
2 changes: 1 addition & 1 deletion dev/initdata/generate-order.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@


/*
* Parametre
* Parameter
*/

define('GEN_NUMBER_COMMANDE', $argv[1] ?? 10);
Expand Down
2 changes: 1 addition & 1 deletion dev/initdata/generate-thirdparty.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@


/*
* Parametre
* Parameter
*/

define('GEN_NUMBER_SOCIETE', $argv[1] ?? 10);
Expand Down
2 changes: 1 addition & 1 deletion dev/initdata/import-thirdparties.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
}
$object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid', 1);
if (empty($object->cond_reglement_id)) {
print " - Error cant find payment mode for ".$condpayment."\n";
print " - Error can't find payment mode for ".$condpayment."\n";
$errorrecord++;
}
}
Expand Down
4 changes: 2 additions & 2 deletions dev/setup/apache/virtualhost
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</Files>


# Log directoves
# Log directives
ErrorLog /var/log/apache2/myvirtualalias_error_log
TransferLog /var/log/apache2/myvirtualalias_access_log

Expand All @@ -82,7 +82,7 @@
AddEncoding gzip .jgz


# Add cach performance directives
# Add cache performance directives
ExpiresActive On
ExpiresByType image/x-icon A2592000
ExpiresByType image/gif A2592000
Expand Down
2 changes: 1 addition & 1 deletion dev/setup/codesniffer/php.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1533,7 +1533,7 @@ session.cache_expire = 180
; - User may send URL contains active session ID
; to other person via. email/irc/etc.
; - URL that contains active session ID may be stored
; in publically accessible computer.
; in publicly accessible computer.
; - User may access your site with the same session ID
; always using URL stored in browser's history or bookmarks.
; http://php.net/session.use-trans-sid
Expand Down
2 changes: 1 addition & 1 deletion dev/setup/codesniffer/ruleset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
</rule> -->


<!-- Check assignement have the = align on each line. Have 20 chars padding maximum and always show as errors -->
<!-- Check assignment have the = align on each line. Have 20 chars padding maximum and always show as errors -->
<!-- Disabled: Report some false warning
<rule ref="Generic.Formatting.MultipleStatementAlignment">
<properties>
Expand Down
2 changes: 1 addition & 1 deletion dev/setup/fail2ban/jail.local
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Examle of rule you can add to fail2ban to restrict bruteforce attacks.
# Example of rule you can add to fail2ban to restrict bruteforce attacks.
#


Expand Down
6 changes: 3 additions & 3 deletions dev/tools/apstats.php
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
$html .= '<div class="box inline-box back2">';
$html .= 'COCOMO effort<br><span class="small">(Basic organic model)</span><br>';
$html .= '<b>'.formatNumber($arraycocomo['proj']['people'] * $arraycocomo['proj']['effort'] + $arraycocomo['dep']['people'] * $arraycocomo['dep']['effort']);
$html .= ' monthes people</b>';
$html .= ' months people</b>';
$html .= '</div>';
$html .= '</div>';

Expand Down Expand Up @@ -432,7 +432,7 @@

print 'Generation of output file '.$outputfile.' done.'."\n";
} else {
print 'Failed to open '.$outputfile.' for ouput.'."\n";
print 'Failed to open '.$outputfile.' for output.'."\n";
}


Expand All @@ -441,7 +441,7 @@
*
* @param string|int $number Number to format
* @param int $nbdec Number of decimal digits
* @return string Formated string
* @return string Formatted string
*/
function formatNumber($number, $nbdec = 0)
{
Expand Down
2 changes: 1 addition & 1 deletion dev/tools/dolibarr-mysql2pgsql.pl
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
}
if ($create_sql ne "") { # we are inside create table statement so lets process datatypes

if (/\);/i) { # end of create table squence
if (/\);/i) { # end of create table sequence
$create_sql =~ s/,$//g; # strip last , inside create table
&output_create;
&reset_vars();
Expand Down
12 changes: 6 additions & 6 deletions dev/tools/dolibarr-postgres2mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function getfieldname($l)
* formatsize
*
* @param string $s Size to format
* @return string Formated size
* @return string Formatted size
*/
function formatsize($s)
{
Expand Down Expand Up @@ -417,9 +417,9 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)

$before = str_replace("\"", "`", $before);

// in after, we need to watch out for escape format strings, ie (E'escaped \r in a string'), and ('bla',E'escaped \r in a string'), but could also be (number, E'string'); so we cant search for the previoous '
// in after, we need to watch out for escape format strings, ie (E'escaped \r in a string'), and ('bla',E'escaped \r in a string'), but could also be (number, E'string'); so we can't search for the previous '
// ugh i guess its possible these strings could exist IN the data as well, but the only way to solve that is to process these lines one character
// at a time, and thats just stupid, so lets just hope this doesnt appear anywhere in the actual data
// at a time, and that's just stupid, so lets just hope this doesn't appear anywhere in the actual data
$after = str_replace(" (E'", " ('", $after);
$after = str_replace(", E'", ", '", $after);

Expand All @@ -439,7 +439,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)

// in after, we need to watch out for escape format strings, ie (E'escaped \r in a string'), and ('bla',E'escaped \r in a string')
// ugh i guess its possible these strings could exist IN the data as well, but the only way to solve that is to process these lines one character
// at a time, and thats just stupid, so lets just hope this doesnt appear anywhere in the actual data
// at a time, and that's just stupid, so lets just hope this doesn't appear anywhere in the actual data
$after = str_replace(" (E'", " ('", $after);
$after = str_replace(", E'", ", '", $after);

Expand All @@ -457,9 +457,9 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)

// in after, we need to watch out for escape format strings, ie (E'escaped \r in a string'), and ('bla',E'escaped \r in a string')
// ugh i guess its possible these strings could exist IN the data as well, but the only way to solve that is to process these lines one character
// at a time, and thats just stupid, so lets just hope this doesnt appear anywhere in the actual data
// at a time, and that's just stupid, so lets just hope this doesn't appear anywhere in the actual data

// after the first line, we only need to check for it in the middle, not at the beginning of an insert (becuase the beginning will be on the first line)
// after the first line, we only need to check for it in the middle, not at the beginning of an insert (because the beginning will be on the first line)
// $after=str_replace(" (E'","' ('",$after);
$line = $lines[$linenumber];
$line = str_replace("', E'", "', '", $line);
Expand Down
4 changes: 2 additions & 2 deletions dev/translation/autotranslator.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class autoTranslator
public function __construct($_destlang, $_refLang, $_langDir, $_limittofile, $_apikey)
{

// Set enviorment variables
// Set environment variables
$this->_destlang = $_destlang;
$this->_refLang = $_refLang;
$this->_langDir = $_langDir.self::DIR_SEPARATOR;
Expand Down Expand Up @@ -206,7 +206,7 @@ private function createTranslationFile($path, $my_destlang)
}

/**
* Put in array _translatedFiles[$file], line of a new tranlated pair
* Put in array _translatedFiles[$file], line of a new translated pair
*
* @param string $content Existing content of dest file
* @param string $file Target file name translated (xxxx.lang)
Expand Down
2 changes: 1 addition & 1 deletion dev/translation/sanity_check_en_langfiles.php
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@

$s.=$file." ";

// Loop on each line keword was found into file.
// Loop on each line keyword was found into file.
$listoffilesforthisentry=array();
foreach ($lines as $line => $translatedvalue) {
if (!empty($listoffilesforthisentry[$file])) {
Expand Down
2 changes: 1 addition & 1 deletion doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</head>
<body>

This directory contains several subdirectories with entries for informations on Dolibarr.<br>
This directory contains several subdirectories with entries for information on Dolibarr.<br>
But if you are looking for other resources (downloads, documentation, addons, ...), you can find this on Internet on web following sites:<br>

<br>
Expand Down
Loading

0 comments on commit 42a0d05

Please sign in to comment.