Changeset:
3cb3ec02e925
https://sourceforge.net/p/mrbs/hg-code/ci/3cb3ec02e9257594060fddcbdd35b1c02aa250b2
Author:
John Beranek <[email protected]>
Date:
Sat Oct 17 21:41:22 2015 +0100
Log message:
Corrected the distinction between the translation tokens
'private' and 'unavailable'.
diffstat:
web/functions_ical.inc | 1 -
web/functions_view.inc | 2 +-
web/mrbs_sql.inc | 2 +-
web/view_entry.php | 4 ++--
4 files changed, 4 insertions(+), 5 deletions(-)
diffs (51 lines):
diff -r 109b222ea9a1 -r 3cb3ec02e925 web/functions_ical.inc
--- a/web/functions_ical.inc Sat Oct 17 11:38:00 2015 +0100
+++ b/web/functions_ical.inc Sat Oct 17 21:41:22 2015 +0100
@@ -1068,7 +1068,6 @@
// Initialize an array to hold the events and a variable to keep track
// of the last repeat id we've seen
$ical_events = array();
- $private_text = "[" . get_vocab("private") . "]";
$n_rows = sql_count($res);
for ($i = 0; ($row = sql_row_keyed($res, $i)); $i++)
diff -r 109b222ea9a1 -r 3cb3ec02e925 web/functions_view.inc
--- a/web/functions_view.inc Sat Oct 17 11:38:00 2015 +0100
+++ b/web/functions_view.inc Sat Oct 17 21:41:22 2015 +0100
@@ -59,7 +59,7 @@
// Go throuh each of the columns and for each of them that can be made
private
// substitute the private text if the user is not allowed to see the data
- $private_text = "[" . get_vocab("private") . "]";
+ $private_text = "[" . get_vocab("unavailable") . "]";
foreach ($data as $key => $value)
{
diff -r 109b222ea9a1 -r 3cb3ec02e925 web/mrbs_sql.inc
--- a/web/mrbs_sql.inc Sat Oct 17 11:38:00 2015 +0100
+++ b/web/mrbs_sql.inc Sat Oct 17 21:41:22 2015 +0100
@@ -81,7 +81,7 @@
if (is_private_event($row['status'] & STATUS_PRIVATE) &&
$is_private_field['entry.name'] &&
!getWritable($row['create_by'], $user, $room_id))
{
- $row['name'] = get_vocab("private");
+ $row['name'] = get_vocab("unavailable");
}
// enclose the viewday etc. links in a span to make it easier for
JavaScript to strip them out
diff -r 109b222ea9a1 -r 3cb3ec02e925 web/view_entry.php
--- a/web/view_entry.php Sat Oct 17 11:38:00 2015 +0100
+++ b/web/view_entry.php Sat Oct 17 21:41:22 2015 +0100
@@ -290,10 +290,10 @@
// Now that we know all the data we start drawing it
echo "<h3" . (($keep_private && $is_private_field['entry.name']) ? "
class=\"private\"" : "") . ">\n";
-echo ($keep_private && $is_private_field['entry.name']) ? "[" .
get_vocab("private") . "]" : htmlspecialchars($row['name']);
+echo ($keep_private && $is_private_field['entry.name']) ? "[" .
get_vocab("unavailable") . "]" : htmlspecialchars($row['name']);
if (is_private_event($private) && $writeable)
{
- echo ' ('.get_vocab("private").')';
+ echo ' ('.get_vocab("unavailable").')';
}
echo "</h3>\n";
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
