From 421b2d44feaa172ba0ee683a2707ddd693f4b698 Mon Sep 17 00:00:00 2001 From: Andrew Hancox Date: Thu, 19 Nov 2015 13:49:06 +0000 Subject: [PATCH] MDL-52230 mod_data: Take fieldname from field:name() AMOS BEGIN CPY [namedate, mod_data],[fieldtypelable, datafield_date] CPY [namefile, mod_data],[fieldtypelable, datafield_file] CPY [namecheckbox, mod_data],[fieldtypelable, datafield_checkbox] CPY [namelatlong, mod_data],[fieldtypelable, datafield_latlong] CPY [namemenu, mod_data],[fieldtypelable, datafield_menu] CPY [namemultimenu, mod_data],[fieldtypelable, datafield_multimenu] CPY [namenumber, mod_data],[fieldtypelable, datafield_number] CPY [namepicture, mod_data],[fieldtypelable, datafield_picture] CPY [nameradiobutton, mod_data],[fieldtypelable, datafield_radiobutton] CPY [nametext, mod_data],[fieldtypelable, datafield_text] CPY [nametextarea, mod_data],[fieldtypelable, datafield_textarea] CPY [nameurl, mod_data],[fieldtypelable, datafield_url] AMOS END --- mod/data/field.php | 2 +- .../checkbox/lang/en/datafield_checkbox.php | 1 + .../field/date/lang/en/datafield_date.php | 1 + .../field/file/lang/en/datafield_file.php | 1 + .../latlong/lang/en/datafield_latlong.php | 1 + .../field/menu/lang/en/datafield_menu.php | 1 + .../multimenu/lang/en/datafield_multimenu.php | 1 + .../field/number/lang/en/datafield_number.php | 1 + .../picture/lang/en/datafield_picture.php | 1 + .../lang/en/datafield_radiobutton.php | 1 + .../field/text/lang/en/datafield_text.php | 1 + .../textarea/lang/en/datafield_textarea.php | 1 + mod/data/field/url/lang/en/datafield_url.php | 1 + mod/data/lang/en/data.php | 26 ++++++++++--------- mod/data/lang/en/deprecated.txt | 12 +++++++++ mod/data/lib.php | 2 +- 16 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 mod/data/lang/en/deprecated.txt diff --git a/mod/data/field.php b/mod/data/field.php index fdf2e87a28e..9ffab95c88b 100644 --- a/mod/data/field.php +++ b/mod/data/field.php @@ -296,7 +296,7 @@ if (($mode == 'new') && (!empty($newtype)) && confirm_sesskey()) { /// $table->data[] = array( html_writer::link($displayurl, $field->field->name), - $field->image() . ' ' . get_string($field->type, 'data'), + $field->image() . ' ' . $field->name(), $field->field->required ? get_string('yes') : get_string('no'), shorten_text($field->field->description, 30), html_writer::link($displayurl, $OUTPUT->pix_icon('t/edit', get_string('edit'))) . diff --git a/mod/data/field/checkbox/lang/en/datafield_checkbox.php b/mod/data/field/checkbox/lang/en/datafield_checkbox.php index d0fa8ad2d4a..b2a3df42a02 100644 --- a/mod/data/field/checkbox/lang/en/datafield_checkbox.php +++ b/mod/data/field/checkbox/lang/en/datafield_checkbox.php @@ -25,3 +25,4 @@ */ $string['pluginname'] = 'Checkbox'; +$string['fieldtypelabel'] = 'Checkbox field'; diff --git a/mod/data/field/date/lang/en/datafield_date.php b/mod/data/field/date/lang/en/datafield_date.php index c8450386218..6638b339b47 100644 --- a/mod/data/field/date/lang/en/datafield_date.php +++ b/mod/data/field/date/lang/en/datafield_date.php @@ -25,3 +25,4 @@ */ $string['pluginname'] = 'Date'; +$string['fieldtypelabel'] = 'Date field'; diff --git a/mod/data/field/file/lang/en/datafield_file.php b/mod/data/field/file/lang/en/datafield_file.php index 690ee8e5c4e..2e97c99358a 100644 --- a/mod/data/field/file/lang/en/datafield_file.php +++ b/mod/data/field/file/lang/en/datafield_file.php @@ -25,3 +25,4 @@ */ $string['pluginname'] = 'File'; +$string['fieldtypelabel'] = 'File field'; diff --git a/mod/data/field/latlong/lang/en/datafield_latlong.php b/mod/data/field/latlong/lang/en/datafield_latlong.php index a4b3cf256bc..b13c38194a2 100644 --- a/mod/data/field/latlong/lang/en/datafield_latlong.php +++ b/mod/data/field/latlong/lang/en/datafield_latlong.php @@ -25,3 +25,4 @@ */ $string['pluginname'] = 'Latlong'; +$string['fieldtypelabel'] = 'Latitude/longitude field'; diff --git a/mod/data/field/menu/lang/en/datafield_menu.php b/mod/data/field/menu/lang/en/datafield_menu.php index 73cec9fc58b..49da27d2ab0 100644 --- a/mod/data/field/menu/lang/en/datafield_menu.php +++ b/mod/data/field/menu/lang/en/datafield_menu.php @@ -25,3 +25,4 @@ */ $string['pluginname'] = 'Menu'; +$string['fieldtypelabel'] = 'Menu field'; diff --git a/mod/data/field/multimenu/lang/en/datafield_multimenu.php b/mod/data/field/multimenu/lang/en/datafield_multimenu.php index 4822dbb7c63..765519c6bf3 100644 --- a/mod/data/field/multimenu/lang/en/datafield_multimenu.php +++ b/mod/data/field/multimenu/lang/en/datafield_multimenu.php @@ -25,3 +25,4 @@ */ $string['pluginname'] = 'Multimenu'; +$string['fieldtypelabel'] = 'Multiple-selection menu field'; diff --git a/mod/data/field/number/lang/en/datafield_number.php b/mod/data/field/number/lang/en/datafield_number.php index 63ecf9223cc..7f2e6372214 100644 --- a/mod/data/field/number/lang/en/datafield_number.php +++ b/mod/data/field/number/lang/en/datafield_number.php @@ -25,3 +25,4 @@ */ $string['pluginname'] = 'Number'; +$string['namenumber'] = 'Number field'; diff --git a/mod/data/field/picture/lang/en/datafield_picture.php b/mod/data/field/picture/lang/en/datafield_picture.php index 134acc961d3..84f71ff4866 100644 --- a/mod/data/field/picture/lang/en/datafield_picture.php +++ b/mod/data/field/picture/lang/en/datafield_picture.php @@ -25,3 +25,4 @@ */ $string['pluginname'] = 'Picture'; +$string['fieldtypelabel'] = 'Picture field'; diff --git a/mod/data/field/radiobutton/lang/en/datafield_radiobutton.php b/mod/data/field/radiobutton/lang/en/datafield_radiobutton.php index 8981640438a..dc2bcb7f235 100644 --- a/mod/data/field/radiobutton/lang/en/datafield_radiobutton.php +++ b/mod/data/field/radiobutton/lang/en/datafield_radiobutton.php @@ -25,3 +25,4 @@ */ $string['pluginname'] = 'Radio button'; +$string['nameradiobutton'] = 'Radio button field'; diff --git a/mod/data/field/text/lang/en/datafield_text.php b/mod/data/field/text/lang/en/datafield_text.php index 2e531134896..5b878029fdc 100644 --- a/mod/data/field/text/lang/en/datafield_text.php +++ b/mod/data/field/text/lang/en/datafield_text.php @@ -25,3 +25,4 @@ */ $string['pluginname'] = 'Text input'; +$string['fieldtypelabel'] = 'Text field'; diff --git a/mod/data/field/textarea/lang/en/datafield_textarea.php b/mod/data/field/textarea/lang/en/datafield_textarea.php index 892aea42f58..c5359b0c7ed 100644 --- a/mod/data/field/textarea/lang/en/datafield_textarea.php +++ b/mod/data/field/textarea/lang/en/datafield_textarea.php @@ -27,3 +27,4 @@ $string['maxbytes'] = 'Maximum embedded file size (bytes)'; $string['maxbytes_desc'] = 'If set to zero will be unlimited by default'; $string['pluginname'] = 'Text area'; +$string['fieldtypelabel'] = 'Textarea field'; diff --git a/mod/data/field/url/lang/en/datafield_url.php b/mod/data/field/url/lang/en/datafield_url.php index 65ddcae80af..4df275deda0 100644 --- a/mod/data/field/url/lang/en/datafield_url.php +++ b/mod/data/field/url/lang/en/datafield_url.php @@ -26,3 +26,4 @@ $string['pluginname'] = 'URL'; $string['openlinkinnewwindow'] = 'Open link in new window'; +$string['fieldtypelabel'] = 'URL field'; \ No newline at end of file diff --git a/mod/data/lang/en/data.php b/mod/data/lang/en/data.php index 484f9e26338..a8127e0dfa1 100644 --- a/mod/data/lang/en/data.php +++ b/mod/data/lang/en/data.php @@ -253,18 +253,6 @@ $string['movezipfailed'] = 'Can\'t move zip'; $string['multientry'] = 'Repeated entry'; $string['multimenu'] = 'Menu (Multi-select)'; $string['multipletags'] = 'Multiple tags found! Template not saved'; -$string['namedate'] = 'Date field'; -$string['namefile'] = 'File field'; -$string['namecheckbox'] = 'Checkbox field'; -$string['namelatlong'] = 'Latitude/longitude field'; -$string['namemenu'] = 'Menu field'; -$string['namemultimenu'] = 'Multiple-selection menu field'; -$string['namenumber'] = 'Number field'; -$string['namepicture'] = 'Picture field'; -$string['nameradiobutton'] = 'Radio button field'; -$string['nametext'] = 'Text field'; -$string['nametextarea'] = 'Textarea field'; -$string['nameurl'] = 'URL field'; $string['newentry'] = 'New entry'; $string['newfield'] = 'Create a new field'; $string['newfield_help'] = 'A field allows the input of data. Each entry in a database activity can have multiple fields of multiple types such as a date field, which allows participants to select a day, month and year from a dropdown list, a picture field, which allows participants to upload an image file, or a checkbox field, which allows participants to select one or more options. @@ -374,3 +362,17 @@ $string['viewfromdate'] = 'Read only from'; $string['viewtodate'] = 'Read only to'; $string['viewtodatevalidation'] = 'The read only to date cannot be before the read only from date.'; $string['wrongdataid'] = 'Wrong data id provided'; + +// Deprecated since Moodle 3.2. +$string['namedate'] = 'Date field'; +$string['namefile'] = 'File field'; +$string['namecheckbox'] = 'Checkbox field'; +$string['namelatlong'] = 'Latitude/longitude field'; +$string['namemenu'] = 'Menu field'; +$string['namemultimenu'] = 'Multiple-selection menu field'; +$string['namenumber'] = 'Number field'; +$string['namepicture'] = 'Picture field'; +$string['nameradiobutton'] = 'Radio button field'; +$string['nametext'] = 'Text field'; +$string['nametextarea'] = 'Textarea field'; +$string['nameurl'] = 'URL field'; \ No newline at end of file diff --git a/mod/data/lang/en/deprecated.txt b/mod/data/lang/en/deprecated.txt new file mode 100644 index 00000000000..cf44132b4d8 --- /dev/null +++ b/mod/data/lang/en/deprecated.txt @@ -0,0 +1,12 @@ +namedate,mod_data +namefile,mod_data +namecheckbox,mod_data +namelatlong,mod_data +namemenu,mod_data +namemultimenu,mod_data +namenumber,mod_data +namepicture,mod_data +nameradiobutton,mod_data +nametext,mod_data +nametextarea,mod_data +nameurl,mod_data \ No newline at end of file diff --git a/mod/data/lib.php b/mod/data/lib.php index 0eeb8789501..6c03edf4921 100644 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -477,7 +477,7 @@ class data_field_base { // Base class for Database Field Types (see field/*/ * @return string */ function name() { - return get_string('name'.$this->type, 'data'); + return get_string('fieldtypelabel', "datafield_$this->type"); } /**