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

Jump to bottom

WIP : Issue 557 #560

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

WIP : Issue 557 #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
20e1963
Fix some formatting in tx script
camlafit Jan 29, 2024
e93877d
Require tx v2 script
camlafit Jan 29, 2024
dd3319f
Migrate transifex configuration to v2
camlafit Jan 29, 2024
ae7fc9c
Restore scritp functionnality
camlafit Jan 29, 2024
68cfec2
Remove mailman po
camlafit Jan 29, 2024
cda74bf
Link translation to weblate service
camlafit Jan 30, 2024
4a3ae51
Remove transifex script
camlafit May 29, 2024
985f20d
Provide a generic gettext function
camlafit May 29, 2024
b1b16d6
Move all string languages in locales directory
camlafit May 29, 2024
ee5b461
Rename _() to __()
camlafit May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
* text=auto !eol
/.svnignore -text
/.travis.yml -text
.tx/config -text
/CODING_CONVENTION.php -text
/COPYING -text
/DEBIAN_COMPLIANCE -text
Expand Down Expand Up @@ -610,7 +609,6 @@ phpunit/tests/_datasets/domaines.yml -text
po/alternc-admintools.pot -text
po/fr/LC_MESSAGES/.svnignore -text
po/fr/LC_MESSAGES/alternc-admintools.po -text
/repos-to-tx.sh -text
roundcube/Makefile -text
roundcube/class/m_roundcube.php -text
roundcube/roundcube-install -text
Expand Down Expand Up @@ -684,7 +682,6 @@ tools/get_domains_by_account -text
tools/top_ftp_users -text
tools/top_http_users -text
tools/top_mysql_users -text
/tx-to-repos.sh -text
upnp/Makefile -text
upnp/adminmenu_upnp.php -text
upnp/m_upnp.php -text
Expand Down
13 changes: 0 additions & 13 deletions .tx/config
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion CODING_CONVENTION.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function enum_ml($domain = null, $order_by = array('domain', 'list')) {
$err->log("mailman","enum_ml");
## when calling an important function, log it that way ##
## when raising an error, use the following syntax ##
$err->raise("classname",_("text in english"));
$err->raise("classname",__("text in english", "alternc", true));
}
}
/* at the end of a php-only file, we don't put a ?> */
Expand Down
11 changes: 11 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,17 @@ The repository and the packages are signed by the pgp key of AlternC nightly bui
wget http://stable-3-5.nightly.alternc.org/nightly.key -O - | apt-key add -
```


## Translation

Translator you're welcome. You can contribute and update any translation on weblate service :

<html>
<a href="https://hosted.weblate.org/engage/alternc/-/en/">
<img src="https://hosted.weblate.org/widget/alternc/-/en/multi-auto.svg" alt="État de la traduction" />
</a>
</html>

## License

AlternC code and translation are distributed under the GPL v2 or later license. See [COPYING](COPYING).
Expand Down
2 changes: 1 addition & 1 deletion awstats/bureau/admin/aws_add.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
getFields($fields);

if (!$id && !$quota->cancreate("aws")) {
$msg->raise('Alert', "aws", _("You cannot add any new statistics, your quota is over."));
$msg->raise('Alert', "aws", __("You cannot add any new statistics, your quota is over.", "alternc", true));
}

include_once("head.php");
Expand Down
4 changes: 2 additions & 2 deletions awstats/bureau/admin/aws_del.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
$r=$aws->delete_stats($val);
$found=true;
if ($r) {
$msg->raise('INFO', "aws", _("The statistics %s has been successfully deleted"),$r);
$msg->raise('INFO', "aws", __("The statistics %s has been successfully deleted", "alternc", true),$r);
}
}
}

if (!$found) {
$msg->raise('INFO', "aws", _("Please check the statistics set you want to delete"));
$msg->raise('INFO', "aws", __("Please check the statistics set you want to delete", "alternc", true));
}

include("aws_list.php");
Expand Down
2 changes: 1 addition & 1 deletion awstats/bureau/admin/aws_doadd.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
include("aws_add.php");
exit();
} else {
$msg->raise('Ok', "aws", _("The statistics has been successfully created"));
$msg->raise('Ok', "aws", __("The statistics has been successfully created", "alternc", true));
include("aws_list.php");
exit();
}
Expand Down
4 changes: 2 additions & 2 deletions awstats/bureau/admin/aws_doedit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
getFields($fields);

if (!$id) {
$msg->raise('Error', "aws", _("No Statistics selected!"));
$msg->raise('Error', "aws", __("No Statistics selected!", "alternc", true));
} else {
$ha ="";
foreach($hostaliases as $ho)
Expand All @@ -44,7 +44,7 @@
include("aws_edit.php");
exit();
} else {
$msg->raise('INFO', "aws", _("The Statistics has been successfully changed"));
$msg->raise('INFO', "aws", __("The Statistics has been successfully changed", "alternc", true));
include("aws_list.php");
exit();
}
Expand Down
2 changes: 1 addition & 1 deletion awstats/bureau/admin/aws_edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
getFields($fields);

if (!$id) {
$msg->raise('Error', "aws", _("No Statistics selected!"));
$msg->raise('Error', "aws", __("No Statistics selected!", "alternc", true));
} else {
$r=$aws->get_stats_details($id);
if ($r) {
Expand Down
4 changes: 2 additions & 2 deletions awstats/bureau/admin/aws_list.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

$nosta=false;
if (!$r=$aws->get_list()) {
$msg->raise('Info', "aws", _("No statistics currently defined"));
$msg->raise('Info', "aws", __("No statistics currently defined", "alternc", true));
$nosta=true;
}

$create=true;
if (!$quota->cancreate("aws")) {
$msg->raise('Info', "aws", _("Your stat quota is over..."));
$msg->raise('Info', "aws", __("Your stat quota is over...", "alternc", true));
$create=false;
}
?>
Expand Down
6 changes: 3 additions & 3 deletions awstats/bureau/admin/aws_pass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@

if ($confirm == 1) {
if (empty($pass) || is_null($pass)) {
$msg->raise('Error', "aws", _("Please enter a password"));
$msg->raise('Error', "aws", __("Please enter a password", "alternc", true));
} else if ($pass != $passconf) {
$msg->raise('Error', "aws", _("Passwords do not match"));
$msg->raise('Error', "aws", __("Passwords do not match", "alternc", true));
} else {
if ($aws->change_pass($login,$pass)) {
$msg->raise('INFO', "aws", _("Password successfuly updated"));
$msg->raise('INFO', "aws", __("Password successfuly updated", "alternc", true));
include("aws_users.php");
exit();
}
Expand Down
4 changes: 2 additions & 2 deletions awstats/bureau/admin/aws_useradd.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
getFields($fields);

if ($pass != $passconf) {
$msg->raise('Error', "aws", _("Passwords do not match"));
$msg->raise('Error', "aws", __("Passwords do not match", "alternc", true));
}else{
$r=$aws->add_login($prefixe.(($login)?"_":"").$login,$pass);

if ($r) {
$msg->raise('INFO', "aws", _("The Awstat account has been successfully created"));
$msg->raise('INFO', "aws", __("The Awstat account has been successfully created", "alternc", true));
}
}

Expand Down
2 changes: 1 addition & 1 deletion awstats/bureau/admin/aws_userdel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
// Effacement du compte ftp $val
$r=$aws->del_login($val);
if ($r) {
$msg->raise('INFO', "aws", _("The awstat account %s has been successfully deleted"),$val);
$msg->raise('INFO', "aws", __("The awstat account %s has been successfully deleted", "alternc", true),$val);
}
}
}
Expand Down