diff --git a/dev/examples/ical/event_recu.txt b/dev/examples/ical/event_recu.txt index d9e62dccbdb..5bcc491a0b3 100644 --- a/dev/examples/ical/event_recu.txt +++ b/dev/examples/ical/event_recu.txt @@ -1,7 +1,7 @@ Example fo 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 occurence was moved on tuesday. So this record were added. +# first occurrence was moved on tuesday. So this record were added. BEGIN:VEVENT DTSTART;TZID=Europe/Paris:20150519T100000 DTEND;TZID=Europe/Paris:20150519T110000 diff --git a/dev/examples/mail/README b/dev/examples/mail/README index 8be1c052768..6b045e32b51 100644 --- a/dev/examples/mail/README +++ b/dev/examples/mail/README @@ -1,5 +1,5 @@ README (English) -------------------------------- -This directory contains example of well formated mail messages. +This directory contains example of well formatted mail messages. This is to help to build the CMailFile.class.php code. diff --git a/dev/initdata/import-products.php b/dev/initdata/import-products.php index 4494e65c280..fa9cfd6592b 100755 --- a/dev/initdata/import-products.php +++ b/dev/initdata/import-products.php @@ -93,7 +93,7 @@ if (! $confirmed) $input = trim(fgets(STDIN)); } -// Open input and ouput files +// Open input and output files $fhandle = fopen($filepath, 'r'); if (! $fhandle) { diff --git a/dev/initdata/import-thirdparties.php b/dev/initdata/import-thirdparties.php index 69b9bb8bdc6..8826ca18544 100755 --- a/dev/initdata/import-thirdparties.php +++ b/dev/initdata/import-thirdparties.php @@ -93,7 +93,7 @@ if (! $confirmed) $input = trim(fgets(STDIN)); } -// Open input and ouput files +// Open input and output files $fhandle = fopen($filepath, 'r'); if (! $fhandle) { diff --git a/dev/initdata/import-users.php b/dev/initdata/import-users.php index 2a1dcc3d826..34130890f4b 100755 --- a/dev/initdata/import-users.php +++ b/dev/initdata/import-users.php @@ -93,7 +93,7 @@ if (! $confirmed) $input = trim(fgets(STDIN)); } -// Open input and ouput files +// Open input and output files $fhandle = fopen($filepath, 'r'); if (! $fhandle) { diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml index a82086fe313..f286175c2f8 100644 --- a/dev/setup/codesniffer/ruleset.xml +++ b/dev/setup/codesniffer/ruleset.xml @@ -166,7 +166,7 @@ - + diff --git a/dev/translation/README b/dev/translation/README index 5f7b1c124e1..b470e4228d8 100644 --- a/dev/translation/README +++ b/dev/translation/README @@ -4,7 +4,7 @@ This directory contains tools to generate translation files for a new languages or to update translation files for existing languages. See Dolibarr Wiki page: http://wiki.dolibarr.org/index.php/Translator_documentation -For more informations on how to use them. +For more information on how to use them. To install transifex client: sudo pip install --upgrade transifex-client diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index f2676620c30..a81aa472ef7 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -188,7 +188,7 @@ if ($action == 'update') { $form = new FormAccounting($db); -// Defaut AccountingAccount RowId Product / Service +// Default AccountingAccount RowId Product / Service // at this time ACCOUNTING_SERVICE_SOLD_ACCOUNT & ACCOUNTING_PRODUCT_SOLD_ACCOUNT are account number not accountingacount rowid // so we need to get those default value rowid first $accounting = new AccountingAccount($db); diff --git a/htdocs/api/README.md b/htdocs/api/README.md index 0b773888882..7ab85cc26bb 100644 --- a/htdocs/api/README.md +++ b/htdocs/api/README.md @@ -43,7 +43,7 @@ Develop an API The API uses Lucarast Restler framework. Please check documentation https://www.luracast.com/products/restler and examples http://help.luracast.com/restler/examples/ -Github contains also usefull informations : https://github.com/Luracast/Restler +Github contains also useful information : https://github.com/Luracast/Restler To implement it into Dolibarr, you need to create a specific class for object we want to use. A skeleton file is available into /modulebuilder/class directory : *api_mymodule_class.class.php* The API class file must be put into object class directory, with specific file name. By example, API class file for '*myobject*' must be put as : /htdocs/*myobject*/class/api_*myobject*.class.php. Class must be named **MyobjectApi**. @@ -67,6 +67,6 @@ It is possible to specify url for API methods by simply use the PHPDoc tag **@ur **Other Annotations** Other annotations are used, you are encouraged to read them : https://github.com/Luracast/Restler/blob/master/ANNOTATIONS.md -PHPDoc tags can also be used to specify variables informations for API. Again, rtfm : https://github.com/Luracast/Restler/blob/master/PARAM.md +PHPDoc tags can also be used to specify variables information for API. Again, rtfm : https://github.com/Luracast/Restler/blob/master/PARAM.md diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php index 02de73eeb0a..f157c90f95d 100644 --- a/htdocs/comm/action/class/actioncommreminder.class.php +++ b/htdocs/comm/action/class/actioncommreminder.class.php @@ -58,7 +58,7 @@ class ActionCommReminder extends CommonObject * 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing) * 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0). * 'index' if we want an index in database. - * 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...). + * 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...). * 'position' is the sort order of field. * 'searchall' is 1 if we want to search in this field when making a search from the quick search button. * 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8). diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php index 1f4d3d7fc95..d005549636c 100644 --- a/htdocs/comm/action/class/ical.class.php +++ b/htdocs/comm/action/class/ical.class.php @@ -109,7 +109,7 @@ class ICal $this->file_text = preg_split("[\n]", $this->file_text); - // is this text vcalendar standart text ? on line 1 is BEGIN:VCALENDAR + // is this text vcalendar standard text ? on line 1 is BEGIN:VCALENDAR if (!stristr($this->file_text[0], 'BEGIN:VCALENDAR')) return 'error not VCALENDAR'; $insidealarm=0; diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 280baebbe5b..580a36425c8 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -528,7 +528,7 @@ class Mailing extends CommonObject /** - * Return a link to the object card (with optionaly the picto) + * Return a link to the object card (with optionally the picto) * * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) * @param string $option On what the link point to ('nolink', ...) diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php index 046d8307466..26173db12af 100644 --- a/htdocs/fichinter/class/api_interventions.class.php +++ b/htdocs/fichinter/class/api_interventions.class.php @@ -65,7 +65,7 @@ class Interventions extends DolibarrApi /** * Get properties of a Expense Report object * - * Return an array with Expense Report informations + * Return an array with Expense Report information * * @param int $id ID of Expense Report * @return array|mixed Data without useless information diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index e162b463caf..97ecffacf95 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -419,7 +419,7 @@ class Fichinter extends CommonObject if ($this->statut == 0) $this->brouillon = 1; - // Retreive extrafields + // Retrieve extrafields $this->fetch_optionals(); /* diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index 92042a8403d..c9342e2f41e 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -90,7 +90,7 @@ if (empty($reshook)) $tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0; $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0'; - // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes + // If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg)) { // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price. @@ -244,7 +244,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { if (! $sortfield) $sortfield = "soc.nom"; - // Build filter to diplay only concerned lines + // Build filter to display only concerned lines $filter = array ( 't.fk_soc' => $object->id ); diff --git a/htdocs/takepos/css/pos.css b/htdocs/takepos/css/pos.css index c47d7190baa..87c74c8952d 100644 --- a/htdocs/takepos/css/pos.css +++ b/htdocs/takepos/css/pos.css @@ -101,7 +101,7 @@ div.description{ bottom:0px; /* position will be on bottom */ left:0px; width:100%; - /* styling bellow */ + /* styling below */ background-color:black; font-family: 'tahoma'; color:white; diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 308bd47f799..9c596a12cd7 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -52,7 +52,7 @@ $resql = $db->query($sql); $row = $db->fetch_array($resql); $placeid = $row[0]; -if (!$placeid) { $placeid = 0; // not necesary +if (!$placeid) { $placeid = 0; // not necessary } else { $invoice = new Facture($db); diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php index 02adf4ace9c..456ddcefdb5 100644 --- a/htdocs/takepos/receipt.php +++ b/htdocs/takepos/receipt.php @@ -40,7 +40,7 @@ if ($place>0){ $object=new Facture($db); $object->fetch($facid); -// IMPORTANT: This file is sended to 'Takepos Printing' application. Keep basic file. No external files as css, js... If you need images use absolut path. +// IMPORTANT: This file is sended to 'Takepos Printing' application. Keep basic file. No external files as css, js... If you need images use absolute path. ?> diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php index 36e35d5a07c..cd7fa0cdf58 100644 --- a/htdocs/website/class/website.class.php +++ b/htdocs/website/class/website.class.php @@ -661,7 +661,7 @@ class Website extends CommonObject } /** - * Return a link to the user card (with optionaly the picto) + * Return a link to the user card (with optionally the picto) * Use this->id,this->lastname, this->firstname * * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) diff --git a/test/README b/test/README index c2cff847c0f..3e13bbbec70 100644 --- a/test/README +++ b/test/README @@ -9,7 +9,7 @@ PHPUNIT To use make phpunit analysis, you must: * Install PHPUnit -If using Eclipse, you must also add an entry as external tool for phpunit programm with: +If using Eclipse, you must also add an entry as external tool for phpunit program with: -Name: PHPUnit -Location: Linux: /usr/bin/php Windows: C:\Program Files (x86)\wamp\bin\php\php5.2.8\php.exe diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php index e9606b001b9..d1be0630e6d 100644 --- a/test/phpunit/RestAPIDocumentTest.php +++ b/test/phpunit/RestAPIDocumentTest.php @@ -149,7 +149,7 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase echo __METHOD__.' Request POST url='.$url."\n"; - // Send to non existant directory + // Send to non existent directory dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit'); @@ -171,7 +171,7 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase $this->assertEquals('401', $object['error']['code']); - // Send to existant directory + // Send to existent directory dol_mkdir(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit2');