Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix missing translations #32962

Merged
merged 7 commits into from
Feb 6, 2025
Merged

fix missing translations #32962

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a9ef15e
fix missing translations
frederic34 Feb 6, 2025
ea2728a
fix missing translations
frederic34 Feb 6, 2025
e1c9dd3
fix missing translations
frederic34 Feb 6, 2025
d69636b
Update index.php
frederic34 Feb 6, 2025
fb71027
Update donateurs_code.php
frederic34 Feb 6, 2025
770a1cc
Merge branch 'develop' into fix/missing_translation
frederic34 Feb 6, 2025
88910af
Merge branch 'develop' into fix/missing_translation
eldy Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions dev/translation/ignore_translation_keys.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ AmountOfinterventionsByMonthHT
AnObjectWithThisClassNameAlreadyExists
AnnualByAccountDueDebtMode
AnnualByAccountInputOutputMode
Anonymous
AnotherField
Applications
Articles
Expand Down Expand Up @@ -200,7 +199,6 @@ CloneProgression
CloneTimes
Close Done
Close2
CloseShipment
CodeTooltipHelp
Column
Combination
Expand All @@ -215,7 +213,6 @@ ConfirmActionMyObject
ConfirmActionTarget
ConfirmCloneMyObject
ConfirmCloneTask
ConfirmCloseShipment
ConfirmCreateAdherent
ConfirmDeleteAdherent
ConfirmDeleteIndividual
Expand Down
1 change: 1 addition & 0 deletions htdocs/langs/en_US/main.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1349,3 +1349,4 @@ EcoTax=Eco-Tax
GroupingLine=Grouping line
AllTime=From start
Transferred=Transferred
Anonymous=Anonymous
2 changes: 2 additions & 0 deletions htdocs/langs/en_US/sendings.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,5 @@ TypeContact_shipping_external_BILLING=Customer invoice contact
TypeContact_shipping_external_CUSTOMER=Customer contact following-up shipping
TypeContact_shipping_external_SHIPPING=Customer contact for shipping
TypeContact_shipping_external_DELIVERY=Customer contact for delivery
CloseShipment=Close shipment
ConfirmCloseShipment=Confirm close shipment
4 changes: 2 additions & 2 deletions htdocs/public/donations/donateurs_code.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -67,7 +67,7 @@
}


$langs->load("donations");
$langs->load("donations", "main");

Check warning on line 70 in htdocs/public/donations/donateurs_code.php

View workflow job for this annotation

GitHub Actions / phan / Run phan 

donateurs_code.php: PhanTypeMismatchArgumentProbablyReal: Argument 2 ($alt) is 'main' of type 'main' but \Translate::load() takes int (no real type) defined at htdocs/core/class/translate.class.php:257 (the inferred real argument type has nothing in common with the parameter's phpdoc type)


/*
Expand Down
8 changes: 3 additions & 5 deletions htdocs/website/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* Copyright (C) 2016-2023 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2020 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -64,7 +64,7 @@
*/

// Load translation files required by the page
$langs->loadLangs(array("admin", "other", "website", "errors"));
$langs->loadLangs(array("admin", "other", "website", "main", "errors"));
frederic34 marked this conversation as resolved.
Show resolved Hide resolved

// Security check
if (!$user->hasRight('website', 'read')) {
Expand Down Expand Up @@ -2078,12 +2078,10 @@
$langs->load("errors");
if ($db->lasterrno == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
$error++;
$langs->load("errors");
setEventMessages($langs->trans("ErrorAPageWithThisNameOrAliasAlreadyExists"), null, 'errors');
$action = 'editmeta';
} else {
$error++;
$langs->load("errors");
setEventMessages($objectpage->error, $objectpage->errors, 'errors');
$action = 'editmeta';
}
Expand Down Expand Up @@ -4809,7 +4807,7 @@ function switchEditorOnline(forceenable)
print '<tr class="trpublicauthor hidden"><td>';
print $langs->trans('PublicAuthorAlias');
print '</td><td>';
print '<input type="text" class="flat minwidth300" name="WEBSITE_AUTHORALIAS" value="'.dol_escape_htmltag($pageauthoralias).'" placeholder="Anonymous">';
print '<input type="text" class="flat minwidth300" name="WEBSITE_AUTHORALIAS" value="'.dol_escape_htmltag($pageauthoralias).'" placeholder="'.dol_escape_htmltag($langs->trans("Anonymous")).'">';
print '</td></tr>';

print '<tr><td class="tdhtmlheader tdtop">';
Expand Down
Loading