nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-31 03:34:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Translation work.

Browse Source
This commit is contained in:
Andrew McMillan 2006-11-07 10:36:20 +13:00
parent bc18397a1e
commit f17af9d74b
7 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/relationship_types.php
View File

@ -21,12 +21,12 @@ require_once("interactive-page.php");
case 'delete': case 'delete':
$qry = new PgQuery("DELETE FROM relationship_type WHERE rt_id = $rt_id;"); $qry = new PgQuery("DELETE FROM relationship_type WHERE rt_id = $rt_id;");
if ( $qry->Exec() ) { if ( $qry->Exec() ) {
$c->messages[] = "Relationship Type Deleted."; $c->messages[] = i18n("Relationship Type Deleted.");
} }
else { else {
$c->messages[] = "Database Error."; $c->messages[] = i18n("Database Error.");
if ( preg_match("/violates foreign key constraint/", $qry->errorstring ) ) { if ( preg_match("/violates foreign key constraint/", $qry->errorstring ) ) {
$c->messages[] = "That relationship type is being used. See ##RelationshipTypeUsed##"; $c->messages[] = i18n("That relationship type is being used. See ##RelationshipTypeUsed##");
} }
} }
break; break;
@ -34,34 +34,34 @@ require_once("interactive-page.php");
case 'add': case 'add':
$rt->PostToValues(); $rt->PostToValues();
if ( $rt->Write() ) { if ( $rt->Write() ) {
$c->messages[] = "Relationship Type Added."; $c->messages[] = i18n("Relationship Type Added.");
} }
else { else {
$c->messages[] = "Database Error."; $c->messages[] = i18n("Database Error.");
} }
break; break;
case 'edit': case 'edit':
$rt->PostToValues(); $rt->PostToValues();
if ( $rt->Write() ) { if ( $rt->Write() ) {
$c->messages[] = "Relationship Type Updated."; $c->messages[] = i18n("Relationship Type Updated.");
} }
else { else {
$c->messages[] = "Database Error."; $c->messages[] = i18n("Database Error.");
} }
break; break;
} }
} }
$c->page_title = "Relationship Types"; $c->page_title = translate("Relationship Types");
$browser = new Browser($c->page_title); $browser = new Browser($c->page_title);
$browser->AddColumn( 'rt_id', 'Id' ); $browser->AddColumn( 'rt_id', 'Id' );
$browser->AddColumn( 'rt_name', 'Name' ); $browser->AddColumn( 'rt_name', translate('Name') );
$browser->AddColumn( 'rt_isgroup', 'To Group?', '', '', "CASE WHEN rt_isgroup THEN 'Yes' ELSE 'No' END" ); $browser->AddColumn( 'rt_isgroup', translate('To Group?'), '', '', "CASE WHEN rt_isgroup THEN 'Yes' ELSE 'No' END" );
$browser->AddColumn( 'confers', 'Rights' ); $browser->AddColumn( 'confers', translate('Rights') );
$browser->AddColumn( 'prefix_match', "Prefix" ); $browser->AddColumn( 'prefix_match', translate("Prefix") );
$browser->AddColumn( 'action', "Action", "", "", "'<a href=\"/relationship_types.php?action=delete&rt_id=' || rt_id || '\">Delete</a>'" ); $browser->AddColumn( 'action', translate("Action"), "", "", "'<a href=\"/relationship_types.php?action=delete&rt_id=' || rt_id || '\">".translate("Delete")."</a>'" );
$browser->SetJoins( 'relationship_type' ); $browser->SetJoins( 'relationship_type' );
@ -75,18 +75,18 @@ require_once("interactive-page.php");
$browser->DoQuery(); $browser->DoQuery();
$rt_name_field = new EntryField( "text", "rt_name", $rt_name_field = new EntryField( "text", "rt_name",
array("title" => "Enter the name for this resource type", array("title" => translate("Enter the name for this resource type"),
"size" => "20") ); "size" => "20") );
$rt_isgroup_field = new EntryField( "checkbox", "rt_isgroup", $rt_isgroup_field = new EntryField( "checkbox", "rt_isgroup",
array("title" => "Is the target of this relationship a group of access rights?") ); array("title" => translate("Is the target of this relationship a group of access rights?")) );
$confers_field = new EntryField( "text", "confers", $confers_field = new EntryField( "text", "confers",
array("title" => "Is this access read ('R') or Read and Write ('RW')?", array("title" => translate("Is this access read ('R') or Read and Write ('RW')?"),
"size" => "5") ); "size" => "5") );
$prefix_match_field = new EntryField( "text", "hprefix_match", $prefix_match_field = new EntryField( "text", "hprefix_match",
array("title" => "Restrict access to prefixes matching this pattern", array("title" => translate("Restrict access to prefixes matching this pattern"),
"size" => "15") ); "size" => "15") );
$browser->AddRow( array( $browser->AddRow( array(
@ -96,7 +96,7 @@ require_once("interactive-page.php");
'rt_isgroup' => $rt_isgroup_field->Render(), 'rt_isgroup' => $rt_isgroup_field->Render(),
'confers' => $confers_field->Render(), 'confers' => $confers_field->Render(),
'prefix_match' => $prefix_match_field->Render(), 'prefix_match' => $prefix_match_field->Render(),
'action' => '<input type="submit" name="submit" value="Add" class="fsubmit">' 'action' => '<input type="submit" name="submit" value="'.translate("Add").'" class="fsubmit">'
) ); ) );
$active_menu_pattern = "#^/relationship#"; $active_menu_pattern = "#^/relationship#";

6
htdocs/user.php
View File

@ -49,10 +49,10 @@
} }
if ( $session->AllowedTo("Admin") ) if ( $session->AllowedTo("Admin") )
$user_menu->AddOption("New User","/user.php?create","Add a new user", false, 10); $user_menu->AddOption(translate("New User"),"/user.php?create",translate("Add a new user"), false, 10);
if ( $user->user_no > 0 && $user->AllowedTo('update') ) { if ( $user->user_no > 0 && $user->AllowedTo('update') ) {
$user_menu->AddOption("View","/user.php?user_no=$user->user_no","View this user record" ); $user_menu->AddOption(translate("View"),"/user.php?user_no=$user->user_no",translate("View this user record") );
$user_menu->AddOption("Edit","/user.php?edit=1&user_no=$user->user_no","Edit this user record", $user->EditMode ); $user_menu->AddOption(translate("Edit"),"/user.php?edit=1&user_no=$user->user_no",translate("Edit this user record"), $user->EditMode );
} }
include("page-header.php"); include("page-header.php");

14
htdocs/users.php
View File

@ -10,13 +10,13 @@ require_once("interactive-page.php");
$c->stylesheets[] = "css/browse.css"; $c->stylesheets[] = "css/browse.css";
$c->scripts[] = "js/browse.js"; $c->scripts[] = "js/browse.js";
$browser = new Browser("Calendar Users"); $browser = new Browser(translate("Calendar Users"));
$browser->AddColumn( 'user_no', 'No.', 'right', '##user_link##' ); $browser->AddColumn( 'user_no', translate('No.'), 'right', '##user_link##' );
$browser->AddColumn( 'username', 'Name' ); $browser->AddColumn( 'username', translate('Name') );
$browser->AddHidden( 'user_link', "'<a href=\"/user.php?user_no=' || user_no || '\">' || user_no || '</a>'" ); $browser->AddHidden( 'user_link', "'<a href=\"/user.php?user_no=' || user_no || '\">' || user_no || '</a>'" );
$browser->AddColumn( 'fullname', 'Full Name' ); $browser->AddColumn( 'fullname', translate('Full Name') );
$browser->AddColumn( 'email', 'EMail' ); $browser->AddColumn( 'email', translate('EMail') );
$browser->SetJoins( 'usr' ); $browser->SetJoins( 'usr' );
@ -29,10 +29,10 @@ require_once("interactive-page.php");
$browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"Click to Display User Detail\" class=\"r%d\">\n", "</tr>\n", '#even' ); $browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"Click to Display User Detail\" class=\"r%d\">\n", "</tr>\n", '#even' );
$browser->DoQuery(); $browser->DoQuery();
$c->page_title = "Calendar Users"; $c->page_title = translate("Calendar Users");
if ( $session->AllowedTo("Admin") ) if ( $session->AllowedTo("Admin") )
$user_menu->AddOption("New User","/user.php?create","Add a new user", false, 10); $user_menu->AddOption(translate("New User"),"/user.php?create",translate("Add a new user"), false, 10);
$active_menu_pattern = "#^/user#"; $active_menu_pattern = "#^/user#";

18
inc/RSCDSUser.php
View File

@ -65,7 +65,7 @@ class RSCDSUser extends User
if ( $ef->EditMode ) { if ( $ef->EditMode ) {
$html .= '<div id="footer">'; $html .= '<div id="footer">';
$html .= $ef->SubmitButton( "submit", (("insert" == $this->WriteType) ? i18n("Create") : i18n("Update")) ); $html .= $ef->SubmitButton( "submit", (("insert" == $this->WriteType) ? translate("Create") : translate("Update")) );
$html .= '</div>'; $html .= '</div>';
$html .= $ef->EndForm(); $html .= $ef->EndForm();
} }
@ -90,7 +90,7 @@ class RSCDSUser extends User
$browser->AddColumn( 'rt_name', translate('Relationship') ); $browser->AddColumn( 'rt_name', translate('Relationship') );
$browser->AddColumn( 'fullname', translate('Linked To'), 'left', '##user_link##' ); $browser->AddColumn( 'fullname', translate('Linked To'), 'left', '##user_link##' );
// $browser->AddColumn( 'is_group', 'Group?', 'centre', '', "CASE WHEN rt_isgroup THEN 'Yes' ELSE 'No' END" ); // $browser->AddColumn( 'is_group', 'Group?', 'centre', '', "CASE WHEN rt_isgroup THEN 'Yes' ELSE 'No' END" );
$browser->AddHidden( 'confers', translate('Confers') ); $browser->AddHidden( 'confers' );
$browser->AddColumn( 'email', translate('EMail') ); $browser->AddColumn( 'email', translate('EMail') );
if ( $ef->EditMode ) { // && $session->AllowedTo("MaintainRelationships") ) { if ( $ef->EditMode ) { // && $session->AllowedTo("MaintainRelationships") ) {
$browser->AddColumn( 'delete', translate('Delete'), 'centre', '', "'<a class=\"\" href=\"/user.php?edit=1&user_no=$this->user_no&action=delete_relationship&to_user=' || user_no || '\">Delete</a>'" ); $browser->AddColumn( 'delete', translate('Delete'), 'centre', '', "'<a class=\"\" href=\"/user.php?edit=1&user_no=$this->user_no&action=delete_relationship&to_user=' || user_no || '\">Delete</a>'" );
@ -112,9 +112,9 @@ class RSCDSUser extends User
* Present an extra editable row at the bottom of the browse. * Present an extra editable row at the bottom of the browse.
*/ */
if ( $ef->EditMode ) { // && $session->AllowedTo("MaintainRelationships") ) { if ( $ef->EditMode ) { // && $session->AllowedTo("MaintainRelationships") ) {
if ( isset($this->roles['Group Target']) ) { if ( isset($this->roles['Group']) ) {
/** /**
* We only allow individuals to link to group targets at this stage. * We only allow individuals to link to groups at this stage.
*/ */
$group_target = 'AND NOT EXISTS (SELECT 1 FROM role_member WHERE role_no = 2 AND user_no=usr.user_no)'; $group_target = 'AND NOT EXISTS (SELECT 1 FROM role_member WHERE role_no = 2 AND user_no=usr.user_no)';
} }
@ -127,10 +127,10 @@ SELECT user_no, fullname FROM usr
EOSQL; EOSQL;
$person_selection = $ef->DataEntryField( "", "lookup", "relate_to", $person_selection = $ef->DataEntryField( "", "lookup", "relate_to",
array("title" => translate("Select the user, resource or group to relate this user to"), array("title" => translate("Select the user, resource or group to relate this user to"),
"_null" => "--- select a user ".( isset($this->roles['Group Target']) ? '' : ', group ' ).'or resource ---', "_null" => "--- select a user ".( isset($this->roles['Group']) ? '' : ', group ' ).'or resource ---',
"_sql" => $sql ) ); "_sql" => $sql ) );
$group_target = ( isset($this->roles['Group Target']) ? 'WHERE NOT rt_isgroup' : '' ); $group_target = ( isset($this->roles['Group']) ? 'WHERE NOT rt_isgroup' : '' );
$relationship_type_selection = $ef->DataEntryField( "", "lookup", "relate_as", $relationship_type_selection = $ef->DataEntryField( "", "lookup", "relate_as",
array("title" => translate("Select the type of relationship from this user"), array("title" => translate("Select the type of relationship from this user"),
"_null" => "--- select a relationship type ---", "_null" => "--- select a relationship type ---",
@ -143,7 +143,7 @@ EOSQL;
) ); ) );
} }
$html = translate(( $title == "" ? "" : $ef->BreakLine($title) )); $html = ( $title == "" ? "" : $ef->BreakLine(translate($title)) );
$html .= "<tr><td>&nbsp;</td><td>\n"; $html .= "<tr><td>&nbsp;</td><td>\n";
$html .= $browser->Render(); $html .= $browser->Render();
$html .= "</td></tr>\n"; $html .= "</td></tr>\n";
@ -166,7 +166,7 @@ EOSQL;
$browser->AddColumn( 'fullname', translate('Linked From'), 'left', '##user_link##' ); $browser->AddColumn( 'fullname', translate('Linked From'), 'left', '##user_link##' );
$browser->AddColumn( 'rt_name', translate('Relationship') ); $browser->AddColumn( 'rt_name', translate('Relationship') );
$browser->AddColumn( 'is_group', translate('Group?'), 'centre', '', "CASE WHEN rt_isgroup THEN 'Yes' ELSE 'No' END" ); $browser->AddColumn( 'is_group', translate('Group?'), 'centre', '', "CASE WHEN rt_isgroup THEN 'Yes' ELSE 'No' END" );
$browser->AddHidden( 'confers', translate('Confers') ); $browser->AddHidden( 'confers' );
$browser->AddColumn( 'email', translate('EMail') ); $browser->AddColumn( 'email', translate('EMail') );
$browser->SetJoins( 'relationship NATURAL JOIN relationship_type rt LEFT JOIN usr ON (from_user = user_no)' ); $browser->SetJoins( 'relationship NATURAL JOIN relationship_type rt LEFT JOIN usr ON (from_user = user_no)' );
@ -181,7 +181,7 @@ EOSQL;
$browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"".translate("Click to display that relationship")."\" class=\"r%d\">\n", "</tr>\n", '#even' ); $browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"".translate("Click to display that relationship")."\" class=\"r%d\">\n", "</tr>\n", '#even' );
$browser->DoQuery(); $browser->DoQuery();
$html = translate( $title == "" ? "" : $ef->BreakLine($title) ); $html = ( $title == "" ? "" : $ef->BreakLine(translate($title)) );
$html .= "<tr><td>&nbsp;</td><td>\n"; $html .= "<tr><td>&nbsp;</td><td>\n";
$html .= $browser->Render(); $html .= $browser->Render();
$html .= "</td></tr>\n"; $html .= "</td></tr>\n";

3
inc/always.php
View File

@ -27,6 +27,7 @@ $c->total_query_time = 0;
$c->dbg = array( "i18n" => 1 ); $c->dbg = array( "i18n" => 1 );
// Utilities
require_once("AWLUtilities.php"); require_once("AWLUtilities.php");
/** /**
@ -43,8 +44,6 @@ $c->protocol_server_port_script = sprintf( "%s://%s%s%s", (isset($_SERVER['HTTPS
dbg_error_log( "LOG", "==========> method =%s= =%s= =%s=", $_SERVER['REQUEST_METHOD'], $c->protocol_server_port_script, $_SERVER['PATH_INFO']); dbg_error_log( "LOG", "==========> method =%s= =%s= =%s=", $_SERVER['REQUEST_METHOD'], $c->protocol_server_port_script, $_SERVER['PATH_INFO']);
// Internationalisation framework
require_once("Translation.php");
init_gettext( 'rscds', $c->base_directory.'/locale' ); init_gettext( 'rscds', $c->base_directory.'/locale' );
if ( file_exists("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php") ) { if ( file_exists("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php") ) {

3
inc/other_translated_strings.php
View File

@ -23,4 +23,7 @@ i18n("Resource");
i18n("Relationship <!-- in the sense of a work relationship between people -->"); i18n("Relationship <!-- in the sense of a work relationship between people -->");
i18n("No. <!-- short for 'Number' -->");
i18n("No.");
?> ?>

3
inc/page-header.php
View File

@ -65,7 +65,8 @@ EOHDR;
echo "<div id=\"pageheader\">\n"; echo "<div id=\"pageheader\">\n";
if ( isset($page_menu) && is_object($page_menu) ) { if ( isset($page_menu) && is_object($page_menu) ) {
$page_menu->AddSubMenu( $relationship_menu, translate("Relationships"), "/relationship_types.php", translate("Browse all relationship types"), false, 4050 ); $page_menu->AddSubMenu( $relationship_menu, translate("Relationships"),
"/relationship_types.php", translate("Browse all relationship types"), false, 4050 );
$page_menu->AddSubMenu( $user_menu, translate("Users"), "/users.php", translate("Browse all users"), false, 4100 ); $page_menu->AddSubMenu( $user_menu, translate("Users"), "/users.php", translate("Browse all users"), false, 4100 );
// $page_menu->AddSubMenu( $role_menu, "Roles", "/roles.php", "Browse all roles", false, 4300 ); // $page_menu->AddSubMenu( $role_menu, "Roles", "/roles.php", "Browse all roles", false, 4300 );
$page_menu->MakeSomethingActive($active_menu_pattern); $page_menu->MakeSomethingActive($active_menu_pattern);