Skip to content

Commit

Permalink
fix misspelled words
Browse files Browse the repository at this point in the history
  • Loading branch information
grandoc committed Feb 5, 2014
1 parent a146af5 commit 1855ba5
Show file tree
Hide file tree
Showing 140 changed files with 1,250 additions and 1,250 deletions.
2 changes: 1 addition & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ For developers:
- New: Support a backtopage parameter on contact creation page.
- New: Add id on div to show logo.
- New: Install wizard can activate a module at end of install.
- New: Dictionnary setup works with very large external dictionnaries (Add
- New: Dictionary setup works with very large external dictionnaries (Add
page navigation).
- New: Add api to draw graphics with javascript (using Jquery Flot).
- New: Can add user login into menu urls added by modules.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ function assign_values(&$action, $id)
$this->tpl['select_country'] = $form->select_country($this->object->country_id,'country_id');
$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';

if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);

// State
if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id,$this->object->country_code);
Expand Down
4 changes: 2 additions & 2 deletions htdocs/adherents/fiche.php
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ function initfieldrequired()
$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;
print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
print $form->select_country(GETPOST('country_id','alpha')?GETPOST('country_id','alpha'):$object->country_id,'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print '</td></tr>';

// State
Expand Down Expand Up @@ -1083,7 +1083,7 @@ function initfieldrequired()
//$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id; // In edit mode we don't force to company country if not defined
print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
print $form->select_country(isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print '</td></tr>';

// State
Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/company.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
print '<tr '.$bc[$var].'><td class="fieldrequired">'.$langs->trans("Country").'</td><td class="maxwidthonsmartphone">';
//if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2); // Par defaut, pays de la localisation
print $form->select_country($mysoc->country_id,'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print '</td></tr>'."\n";

$var=!$var;
Expand Down
60 changes: 30 additions & 30 deletions htdocs/admin/dict.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,31 +102,31 @@

// Dictionary labels
$tablib=array();
$tablib[1] = "DictionnaryCompanyJuridicalType";
$tablib[2] = "DictionnaryCanton";
$tablib[3] = "DictionnaryRegion";
$tablib[4] = "DictionnaryCountry";
$tablib[5] = "DictionnaryCivility";
$tablib[6] = "DictionnaryActions";
$tablib[7] = "DictionnarySocialContributions";
$tablib[8] = "DictionnaryCompanyType";
$tablib[9] = "DictionnaryCurrency";
$tablib[10]= "DictionnaryVAT";
$tablib[11]= "DictionnaryTypeContact";
$tablib[12]= "DictionnaryPaymentConditions";
$tablib[13]= "DictionnaryPaymentModes";
$tablib[14]= "DictionnaryEcotaxe";
$tablib[15]= "DictionnaryPaperFormat";
$tablib[16]= "DictionnaryProspectLevel";
$tablib[17]= "DictionnaryFees";
$tablib[18]= "DictionnarySendingMethods";
$tablib[19]= "DictionnaryStaff";
$tablib[20]= "DictionnaryOrderMethods";
$tablib[21]= "DictionnaryAvailability";
$tablib[22]= "DictionnarySource";
$tablib[23]= "DictionnaryAccountancyplan";
$tablib[24]= "DictionnaryAccountancysystem";
$tablib[25]= "DictionnaryRevenueStamp";
$tablib[1] = "DictionaryCompanyJuridicalType";
$tablib[2] = "DictionaryCanton";
$tablib[3] = "DictionaryRegion";
$tablib[4] = "DictionaryCountry";
$tablib[5] = "DictionaryCivility";
$tablib[6] = "DictionaryActions";
$tablib[7] = "DictionarySocialContributions";
$tablib[8] = "DictionaryCompanyType";
$tablib[9] = "DictionaryCurrency";
$tablib[10]= "DictionaryVAT";
$tablib[11]= "DictionaryTypeContact";
$tablib[12]= "DictionaryPaymentConditions";
$tablib[13]= "DictionaryPaymentModes";
$tablib[14]= "DictionaryEcotaxe";
$tablib[15]= "DictionaryPaperFormat";
$tablib[16]= "DictionaryProspectLevel";
$tablib[17]= "DictionaryFees";
$tablib[18]= "DictionarySendingMethods";
$tablib[19]= "DictionaryStaff";
$tablib[20]= "DictionaryOrderMethods";
$tablib[21]= "DictionaryAvailability";
$tablib[22]= "DictionarySource";
$tablib[23]= "DictionaryAccountancyplan";
$tablib[24]= "DictionaryAccountancysystem";
$tablib[25]= "DictionaryRevenueStamp";

// Requete pour extraction des donnees des dictionnaires
$tabsql=array();
Expand Down Expand Up @@ -655,18 +655,18 @@

llxHeader();

$titre=$langs->trans("DictionnarySetup");
$titre=$langs->trans("DictionarySetup");
$linkback='';
if ($id)
{
$titre.=' - '.$langs->trans($tablib[$id]);
$linkback='<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionnaryList").'</a>';
$linkback='<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
}
print_fiche_titre($titre,$linkback,'setup');

if (empty($id))
{
print $langs->trans("DictionnaryDesc");
print $langs->trans("DictionaryDesc");
print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
}
print "<br>\n";
Expand Down Expand Up @@ -1148,7 +1148,7 @@
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
//print '<td>'.$langs->trans("Module").'</td>';
print '<td colspan="2">'.$langs->trans("Dictionnary").'</td>';
print '<td colspan="2">'.$langs->trans("Dictionary").'</td>';
print '<td>'.$langs->trans("Table").'</td>';
print '</tr>';

Expand Down Expand Up @@ -1181,7 +1181,7 @@
print '<td>';
/*if (empty($tabcond[$i]))
{
print info_admin($langs->trans("DictionnaryDisabledSinceNoModuleNeedIt"),1);
print info_admin($langs->trans("DictionaryDisabledSinceNoModuleNeedIt"),1);
}*/
print '</td>';
print '<td>'.$tabname[$i].'</td></tr>';
Expand Down
8 changes: 4 additions & 4 deletions htdocs/admin/pdf.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@


// Misc options
print_fiche_titre($langs->trans("DictionnaryPaperFormat"),'','').'<br>';
print_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'<br>';
$var=true;
print '<table summary="more" class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
Expand All @@ -120,7 +120,7 @@

// Show pdf format
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("DictionnaryPaperFormat").'</td><td>';
print '<tr '.$bc[$var].'><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';
print $formadmin->select_paper_format($selected,'MAIN_PDF_FORMAT');
print '</td></tr>';

Expand Down Expand Up @@ -262,14 +262,14 @@
$var=true;

// Misc options
print_fiche_titre($langs->trans("DictionnaryPaperFormat"),'','').'<br>';
print_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'<br>';
$var=true;
print '<table summary="more" class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';

// Show pdf format
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("DictionnaryPaperFormat").'</td><td>';
print '<tr '.$bc[$var].'><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';

$pdfformatlabel='';
if (empty($conf->global->MAIN_PDF_FORMAT))
Expand Down
2 changes: 1 addition & 1 deletion htdocs/commande/fiche.php
Original file line number Diff line number Diff line change
Expand Up @@ -2177,7 +2177,7 @@
// Removed because using dictionnary is an admin feature, not a user feature. Ther is already the "star" to show info to admin users.
// This is to avoid too heavy screens and have an uniform look and feel for all screens.
//print '</td><td>';
//print '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=22&origin=order&originid='.$object->id.'">'.$langs->trans("DictionnarySource").'</a>';
//print '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=22&origin=order&originid='.$object->id.'">'.$langs->trans("DictionarySource").'</a>';
print '</td></tr>';

// Project
Expand Down
4 changes: 2 additions & 2 deletions htdocs/compta/bank/fiche.php
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
}
else if (empty($selectedcode)) $selectedcode=$mysoc->country_code;
print $form->select_country($selectedcode,'account_country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print '</td></tr>';

// State
Expand Down Expand Up @@ -550,7 +550,7 @@
if (isset($_POST["account_country_id"])) $selectedcode=$_POST["account_country_id"];
else if (empty($selectedcode)) $selectedcode=$mysoc->country_code;
print $form->select_country($selectedcode,'account_country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print '</td></tr>';

// State
Expand Down
2 changes: 1 addition & 1 deletion htdocs/contact/canvas/actions_contactcard_common.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ function assign_values(&$action, $id)
$this->tpl['select_country'] = $form->select_country($this->object->country_id,'country_id');
$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';

if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);

// State
if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->fk_departement,$this->object->country_code);
Expand Down
4 changes: 2 additions & 2 deletions htdocs/contact/fiche.php
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@
// Country
print '<tr><td>'.$langs->trans("Country").'</td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
print $form->select_country((isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id),'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print '</td></tr>';

// State
Expand Down Expand Up @@ -688,7 +688,7 @@
// Country
print '<tr><td>'.$langs->trans("Country").'</td><td colspan="2" class="maxwidthonsmartphone">';
print $form->select_country(isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print '</td></tr>';

// State
Expand Down
14 changes: 7 additions & 7 deletions htdocs/core/class/html.form.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ function select_type_of_lines($selected='',$htmlname='type',$showempty=0,$hidete
print '>'.$langs->trans("Service");

print '</select>';
//if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
//if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
}
if (! $forceall && empty($conf->product->enabled) && ! empty($conf->service->enabled))
{
Expand Down Expand Up @@ -662,7 +662,7 @@ function select_type_fees($selected='',$htmlname='type',$showempty=0)
}

print '</select>';
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
}


Expand Down Expand Up @@ -2105,7 +2105,7 @@ function select_availability($selected='',$htmlname='availid',$filtertype='',$ad
print '</option>';
}
print '</select>';
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
}

/**
Expand Down Expand Up @@ -2185,7 +2185,7 @@ function select_demand_reason($selected='',$htmlname='demandreasonid',$exclude='
print '</option>';
}
print '</select>';
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
}

/**
Expand Down Expand Up @@ -2261,7 +2261,7 @@ function select_conditions_paiements($selected='',$htmlname='condid',$filtertype
print '</option>';
}
print '</select>';
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
}


Expand Down Expand Up @@ -2316,7 +2316,7 @@ function select_types_paiements($selected='',$htmlname='paiementtype',$filtertyp
print '</option>';
}
print '</select>';
if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
}


Expand Down Expand Up @@ -3239,7 +3239,7 @@ function selectcurrency($selected='',$htmlname='currency_id')
$out.= '</option>';
}
$out.= '</select>';
if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
return $out;
}

Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/class/html.formactions.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ function select_type_actions($selected='',$htmlname='actioncode',$excludetype=''
if ($selected == 'auto') $selected='AC_OTH_AUTO';

print $form->selectarray($htmlname, $arraylist, $selected);
if ($user->admin && empty($onlyautoornot)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin && empty($onlyautoornot)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
}

}
6 changes: 3 additions & 3 deletions htdocs/core/class/html.formcompany.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ function select_state($selected='',$country_codeid=0, $htmlname='state_id')
}
}
if (! empty($htmlname)) $out.= '</select>';
if (! empty($htmlname) && $user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if (! empty($htmlname) && $user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
}
else
{
Expand Down Expand Up @@ -395,7 +395,7 @@ function select_civility($selected='',$htmlname='civilite_id')
}
}
$out.= '</select>';
if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
}
else
{
Expand Down Expand Up @@ -488,7 +488,7 @@ function select_juridicalstatus($selected='', $country_codeid=0, $filter='')
}
}
$out.= '</select>';
if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
$out.= '</div>';
}
else
Expand Down
4 changes: 2 additions & 2 deletions htdocs/core/class/html.formother.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,7 @@ function updateBoxOrder(closing) {
* Return a HTML select list of bank accounts
*
* @param string $htmlname Name of select zone
* @param string $dictionnarytable Dictionnary table
* @param string $dictionnarytable Dictionary table
* @param string $keyfield Field for key
* @param string $labelfield Label field
* @param string $selected Selected value
Expand Down Expand Up @@ -1138,7 +1138,7 @@ function select_dictionnary($htmlname,$dictionnarytable,$keyfield='code',$labelf
}
else
{
print $langs->trans("DictionnaryEmpty");
print $langs->trans("DictionaryEmpty");
}
}
else {
Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/class/html.formsocialcontrib.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function select_type_socialcontrib($selected='',$htmlname='actioncode', $useempt
$i++;
}
print '</select>';
if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/menus/init_menu_auguria.sql
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 107__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/pdf.php?leftmenu=setup', 'PDF', 1, 'admin', '', '', 2, 9, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 10, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'SMS', 1, 'admin', '', '', 2, 11, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'Dictionnary', 1, 'admin', '', '', 2, 12, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'Dictionary', 1, 'admin', '', '', 2, 12, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 13, __ENTITY__);
-- Home - Sytem info
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$user->admin', __HANDLER__, 'left', 300__+MAX_llx_menu__, 'home', 'admintools', 1__+MAX_llx_menu__, '/admin/tools/index.php?leftmenu=admintools', 'SystemTools', 0, 'admin', '', '', 2, 2, __ENTITY__);
Expand Down

0 comments on commit 1855ba5

Please sign in to comment.