Commit 7c290e02 authored by Stuart McDonald's avatar Stuart McDonald Committed by Stuart McDonald
Browse files

Merge branch 'master' of git://git.mahara.org/git/mahara

parents deff8a39 3dfcf62b
......@@ -109,7 +109,7 @@ class PluginBlocktypeContactinfo extends PluginBlocktype {
'title' => get_string('email', 'artefact.internal'),
'options' => $options,
'defaultvalue' => (isset($configdata['email'])) ? $configdata['email'] : 0,
'separator' => '<br />',
'separator' => '<br>',
);
// Which fields does the user want
......
......@@ -63,6 +63,7 @@ class PluginBlocktypeTextbox extends SystemBlocktype {
$artefacts = array();
$configdata = $instance->get('configdata');
if (isset($configdata['text'])) {
require_once(get_config('docroot') . 'artefact/lib.php');
$artefacts = artefact_get_references_in_html($configdata['text']);
}
return $artefacts;
......
......@@ -242,7 +242,7 @@ class PluginInteractionForum extends PluginInteraction {
FROM {group} g
LEFT JOIN {interaction_instance} ii ON g.id = ii.group
LEFT JOIN {interaction_forum_instance_config} ific ON ific.forum = ii.id
WHERE {group} = ? AND ific.field = 'autosubscribe' and ific.value = '1'",
WHERE \"group\" = ? AND ific.field = 'autosubscribe' and ific.value = '1'",
array($gm['group']))) {
db_begin();
foreach ($forumids as $forumid) {
......
<a name="post{$post->id}"></a>
<div>
<table class="forumpost">
......@@ -15,7 +14,6 @@
{$post->poster|display_name|escape}</a></h5>
<div><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=100&amp;id={$post->poster}" alt=""></div>
<h5>{$post->postcount}</h5></td>
<td>{$post->body}</td>
<td>{$post->body|clean_html}</td>
</tr>
</table>
</div>
......@@ -649,10 +649,6 @@ function ViewManager() {
setOpacity(blockinstance, 1);
if (self.isIE7) {
innerelement = null;
}
// Sadly we have to return an effect, because this requires
// something cancellable. Would be good to return nothing
return new MochiKit.Visual.Move(innerelement,
......@@ -752,10 +748,6 @@ function ViewManager() {
self.movingBlockType = false;
if (self.isIE7) {
innerelement = null;
}
// Sadly we have to return an effect, because this requires
// something cancellable. Would be good to return nothing
return new MochiKit.Visual.Move(innerelement,
......
......@@ -34,6 +34,7 @@ $string['mysqldbextensionnotloaded'] = 'Your server configuration does not inclu
$string['unknowndbtype'] = 'Your server configuration references an unknown database type. Valid values are "postgres8" and "mysql5". Please change the database type setting in config.php.';
$string['xmlextensionnotloaded'] = 'Your server configuration does not include the %s extension. Mahara requires this in order to parse XML data from a variety of sources. Please make sure that it is loaded in php.ini, or install it if it is not installed.';
$string['gdextensionnotloaded'] = 'Your server configuration does not include the gd extension. Mahara requires this in order to perform resizes and other operations on uploaded images. Please make sure that it is loaded in php.ini, or install it if it is not installed.';
$string['gdfreetypenotloaded'] = 'Your server configuration of the gd extension does not include Freetype support. Mahara requires this to in order to build CAPTCHA images. Please make sure that gd is configured with it.';
$string['sessionextensionnotloaded'] = 'Your server configuration does not include the session extension. Mahara requires this in order to support users logging in. Please make sure that it is loaded in php.ini, or install it if it is not installed.';
$string['registerglobals'] = 'You have dangerous PHP settings, register_globals is on. Mahara is trying to work around this, but you should really fix it';
$string['magicquotesgpc'] = 'You have dangerous PHP settings, magic_quotes_gpc is on. Mahara is trying to work around this, but you should really fix it';
......
......@@ -69,6 +69,12 @@ function ensure_sanity() {
throw new ConfigSanityException(get_string('sessionextensionnotloaded', 'error'));
}
//Check for freetype in the gd extension
$gd_info = gd_info();
if (!$gd_info['FreeType Support']) {
throw new ConfigSanityException(get_string('gdfreetypenotloaded', 'error'));
}
// register globals workaround
if (ini_get_bool('register_globals')) {
log_environ(get_string('registerglobals', 'error'));
......
......@@ -145,6 +145,13 @@ function pieform_element_bytes_i18n() {/*{{{*/
'megabytes' => 'MB',
'invalidvalue' => '値は数値にしてください',
),
'es.utf8' => array(
'bytes' => 'Bytes',
'kilobytes' => 'Kilobytes',
'megabytes' => 'Megabytes',
'invalidvalue' => 'El valor debe ser un número',
),
);
}/*}}}*/
......
......@@ -164,6 +164,10 @@ function pieform_element_calendar_i18n() {/*{{{*/
'ja.utf8' => array(
'invalidvalue' => '無効な日付/時間が指定されました'
),
'es.utf8' => array(
'invalidvalue' => 'Fecha/hora indicada inválida'
),
);
}/*}}}*/
......
......@@ -145,6 +145,11 @@ function pieform_element_date_i18n() {/*{{{*/
'or' => 'or',
'notspecified' => '指定なし'
),
'es.utf8' => array(
'or' => 'o',
'notspecified' => 'Sin valor'
),
);
}/*}}}*/
......
......@@ -152,6 +152,14 @@ function pieform_element_expiry_i18n() {/*{{{*/
'years' => '年',
'noenddate' => '終了日なし'
),
'es.utf8' => array(
'days' => 'Días',
'weeks' => 'Semanas',
'months' => 'Meses',
'years' => 'Años',
'noenddate' => 'Sin fecha de finalización'
),
);
}/*}}}*/
......
......@@ -57,6 +57,9 @@ function pieform_rule_before_i18n() {/*{{{*/
'ja.utf8' => array(
'before' => 'フィールド「 %s 」の後に設定することはできません'
),
'es.utf8' => array(
'before' => 'No puede ser posterior al campo "%s"'
),
);
}/*}}}*/
......
......@@ -56,6 +56,10 @@ function pieform_rule_email_i18n() {/*{{{*/
'ja.utf8' => array(
'email' => 'メールアドレスが有効ではありません'
),
'es.utf8' => array(
'email' => 'Dirección de correo errónea'
),
);
}/*}}}*/
......
......@@ -53,6 +53,10 @@ function pieform_rule_integer_i18n() {/*{{{*/
'ja.utf8' => array(
'integer' => 'フィールドは整数にしてください'
),
'es.utf8' => array(
'integer' => 'Este campo debe ser un número entero'
),
);
}/*}}}*/
......
......@@ -53,6 +53,10 @@ function pieform_rule_maxlength_i18n() {/*{{{*/
'ja.utf8' => array(
'maxlength' => 'このフィールドは、最大半角 %d 文字にしてください'
),
'es.utf8' => array(
'maxlength' => 'Este campo tiene que tener como máximo %d caracteres'
),
);
}/*}}}*/
......
......@@ -53,6 +53,10 @@ function pieform_rule_maxvalue_i18n() {/*{{{*/
'ja.utf8' => array(
'maxvalue' => 'この値は %d 以下にしてください'
),
'es.utf8' => array(
'maxvalue' => 'Este valor no puede ser superior a %d'
),
);
}/*}}}*/
......
......@@ -50,6 +50,10 @@ function pieform_rule_minlength_i18n() {/*{{{*/
'fr.utf8' => array(
'minlength' => 'Ce champ doit contenir au moins %d caractères',
),
'es.utf8' => array(
'minlength' => 'Este campo debe tener como mínimo %d caracteres',
),
);
}/*}}}*/
......
......@@ -53,6 +53,10 @@ function pieform_rule_minvalue_i18n() {/*{{{*/
'ja.utf8' => array(
'minvalue' => 'この値は %d 以下にすることはできません'
),
'es.utf8' => array(
'minvalue' => 'Este valor no puede ser inferior a %d'
),
);
}/*}}}*/
......
......@@ -54,6 +54,10 @@ function pieform_rule_regex_i18n() {/*{{{*/
'ja.utf8' => array(
'regex' => 'このフィールドは正しい形式ではありません'
),
'es.utf8' => array(
'regex' => 'Este campo no tiene un formato válido'
),
);
}/*}}}*/
......
......@@ -53,6 +53,9 @@ function pieform_rule_required_i18n() {/*{{{*/
'ja.utf8' => array(
'required' => 'このフィールドは、必須入力フィールドです。'
),
'es.utf8' => array(
'required' => 'Este campo es obligatorio'
),
);
}/*}}}*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment