Skip to content

Commit

Permalink
Fixing language strings to reflect item type
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Hunziker committed Nov 28, 2016
1 parent 0826c6a commit d70dcba
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 81 deletions.
57 changes: 3 additions & 54 deletions administrator/components/com_fields/controllers/fields.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,64 +16,13 @@
class FieldsControllerFields extends JControllerAdmin
{
/**
* Check in of one or more records.
* The prefix to use with controller messages.
*
* @return boolean True on success
* @var string
*
* @since __DEPLOY_VERSION__
*/
public function checkin()
{
$return = parent::checkin();

$this->setRedirect(
JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list .
'&context=' . $this->input->getCmd('context', 'com_content.article'), false
)
);

return $return;
}

/**
* Removes an item
*
* @return void
*
* @since __DEPLOY_VERSION__
*/
public function delete()
{
parent::delete();

$this->setRedirect(
JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list .
'&context=' . $this->input->getCmd('context', 'com_content.article'), false
)
);

return;
}

/**
* Method to publish a list of items
*
* @return void
*
* @since __DEPLOY_VERSION__
*/
public function publish()
{
parent::publish();

$this->setRedirect(
JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list .
'&context=' . $this->input->getCmd('context', 'com_content.article'), false
)
);

return;
}
protected $text_prefix = 'COM_FIELDS_FIELD';

/**
* Proxy for getModel.
Expand Down
17 changes: 3 additions & 14 deletions administrator/components/com_fields/controllers/groups.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,13 @@
class FieldsControllerGroups extends JControllerAdmin
{
/**
* Check in of one or more records.
* The prefix to use with controller messages.
*
* @return boolean True on success
* @var string
*
* @since __DEPLOY_VERSION__
*/
public function checkin()
{
$return = parent::checkin();

$this->setRedirect(
JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list .
'&extension=' . $this->input->getCmd('extension'), false
)
);

return $return;
}
protected $text_prefix = 'COM_FIELDS_GROUP';

/**
* Proxy for getModel.
Expand Down
39 changes: 26 additions & 13 deletions administrator/language/en-GB/en-GB.com_fields.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,32 @@ COM_FIELDS_GROUP_PERMISSION_EDITVALUE_DESC="Who can edit the field value in the
COM_FIELDS_GROUP_PERMISSION_EDIT_DESC="New setting for <strong>edit actions</strong> on this field group and the calculated setting based on the parent extension permissions."
COM_FIELDS_MUSTCONTAIN_A_TITLE_FIELD="Field must have a title."
COM_FIELDS_MUSTCONTAIN_A_TITLE_GROUP="Field Group must have a title."
COM_FIELDS_N_ITEMS_ARCHIVED="%d fields successfully archived"
COM_FIELDS_N_ITEMS_ARCHIVED_1="%d field successfully archived"
COM_FIELDS_N_ITEMS_CHECKED_IN_0="No field successfully checked in"
COM_FIELDS_N_ITEMS_CHECKED_IN_1="%d field successfully checked in"
COM_FIELDS_N_ITEMS_CHECKED_IN_MORE="%d fields successfully checked in"
COM_FIELDS_N_ITEMS_DELETED="%d fields successfully deleted"
COM_FIELDS_N_ITEMS_DELETED_1="%d field successfully deleted"
COM_FIELDS_N_ITEMS_PUBLISHED="%d fields successfully published"
COM_FIELDS_N_ITEMS_PUBLISHED_1="%d field successfully published"
COM_FIELDS_N_ITEMS_TRASHED="%d fields successfully trashed"
COM_FIELDS_N_ITEMS_TRASHED_1="%d field successfully trashed"
COM_FIELDS_N_ITEMS_UNPUBLISHED="%d fields successfully unpublished"
COM_FIELDS_N_ITEMS_UNPUBLISHED_1="%d field successfully unpublished"
COM_FIELDS_FIELD_N_ITEMS_ARCHIVED="%d fields successfully archived"
COM_FIELDS_FIELD_N_ITEMS_ARCHIVED_1="%d field successfully archived"
COM_FIELDS_FIELD_N_ITEMS_CHECKED_IN="%d fields successfully checked in"
COM_FIELDS_FIELD_N_ITEMS_CHECKED_IN_0="No field successfully checked in"
COM_FIELDS_FIELD_N_ITEMS_CHECKED_IN_1="%d field successfully checked in"
COM_FIELDS_FIELD_N_ITEMS_DELETED="%d fields successfully deleted"
COM_FIELDS_FIELD_N_ITEMS_DELETED_1="%d field successfully deleted"
COM_FIELDS_FIELD_N_ITEMS_PUBLISHED="%d fields successfully published"
COM_FIELDS_FIELD_N_ITEMS_PUBLISHED_1="%d field successfully published"
COM_FIELDS_FIELD_N_ITEMS_TRASHED="%d fields successfully trashed"
COM_FIELDS_FIELD_N_ITEMS_TRASHED_1="%d field successfully trashed"
COM_FIELDS_FIELD_N_ITEMS_UNPUBLISHED="%d fields successfully unpublished"
COM_FIELDS_FIELD_N_ITEMS_UNPUBLISHED_1="%d field successfully unpublished"
COM_FIELDS_GROUP_N_ITEMS_ARCHIVED="%d field groups successfully archived"
COM_FIELDS_GROUP_N_ITEMS_ARCHIVED_1="%d field group successfully archived"
COM_FIELDS_GROUP_N_ITEMS_CHECKED_IN="%d field groups successfully checked in"
COM_FIELDS_GROUP_N_ITEMS_CHECKED_IN_0="No field group successfully checked in"
COM_FIELDS_GROUP_N_ITEMS_CHECKED_IN_1="%d field group successfully checked in"
COM_FIELDS_GROUP_N_ITEMS_DELETED="%d field groups successfully deleted"
COM_FIELDS_GROUP_N_ITEMS_DELETED_1="%d field group successfully deleted"
COM_FIELDS_GROUP_N_ITEMS_PUBLISHED="%d field groups successfully published"
COM_FIELDS_GROUP_N_ITEMS_PUBLISHED_1="%d field group successfully published"
COM_FIELDS_GROUP_N_ITEMS_TRASHED="%d field groups successfully trashed"
COM_FIELDS_GROUP_N_ITEMS_TRASHED_1="%d field group successfully trashed"
COM_FIELDS_GROUP_N_ITEMS_UNPUBLISHED="%d field groups successfully unpublished"
COM_FIELDS_GROUP_N_ITEMS_UNPUBLISHED_1="%d field group successfully unpublished"
COM_FIELDS_SYSTEM_PLUGIN_NOT_ENABLED="The <a href="_QQ_"%s"_QQ_">Fields System Plugin</a> is disabled. The custom fields will not display if you do not enable this plugin."
COM_FIELDS_TYPE_CALENDAR="Calendar"
COM_FIELDS_TYPE_CAPTCHA="CAPTCHA"
Expand Down

0 comments on commit d70dcba

Please sign in to comment.