Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Artofuser #1

Merged
merged 3 commits into from

2 participants

@tuum

Hi Michael,

I'm a git newbie so I apologize in advance if I'm doing this wrong. I've corrected the database prefix in the sample data, and added the language strings.

regards

Tim

@mbabker
Owner

You got it right Tim. Thanks for catching the prefix error.

@mbabker mbabker referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@mbabker mbabker merged commit c3ddef7 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 5, 2011
  1. @tuum

    Merge pull request #1 from mbabker/artofuser

    tuum authored
    Integration work
Commits on Dec 6, 2011
  1. @tuum
  2. @tuum
This page is out of date. Refresh to see the latest.
View
29 administrator/language/en-GB/en-GB.com_users.ini
@@ -7,7 +7,9 @@
COM_USERS="Users Manager"
COM_USERS_ACTIONS_AVAILABLE="Actions Permitted"
COM_USERS_ACTIVATED="Activated"
+COM_USERS_ADD_NOTE="Add a note"
COM_USERS_ASSIGNED_GROUPS="Assigned User Groups"
+COM_USERS_CATEGORY_HEADING="Category"
COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_DESC="If set to Yes, new Users allowed to self-register."
COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_LABEL="Allow User Registration"
COM_USERS_CONFIG_FIELD_FRONTEND_LANG_DESC="If 'Frontend User Parameters' is set to 'Show', users will be able to select their frontend language preference when registering. <br />This is specially handy in a multilanguage setting."
@@ -39,10 +41,25 @@ COM_USERS_DEBUG_LEGEND="Legend:"
COM_USERS_DEBUG_NO_CHECK="[ &#160; ] Not Applicable"
COM_USERS_DEBUG_USER="Debug Permissions Report"
COM_USERS_DELETE_ERROR_INVALID_GROUP="You cannot delete user groups to which you belong."
+COM_USERS_EDIT_NOTE_N="Editing note with ID #%d"
COM_USERS_EDIT_USER="Edit User %s"
+COM_USERS_EMPTY_REVIEW="-"
+COM_USERS_EMPTY_SUBJECT="- No subject -"
COM_USERS_ERROR_INVALID_GROUP="Invalid Group"
COM_USERS_ERROR_LEVELS_NOLEVELS_SELECTED="No View Permission Level(s) selected."
COM_USERS_ERROR_VIEW_LEVEL_IN_USE="You cannot delete the view access level '%d:%s' because it is being used by content."
+COM_USERS_FIELD_CATEGORY_ID_LABEL="Category"
+COM_USERS_FIELD_ID_LABEL="ID"
+COM_USERS_FIELD_NOTEBODY_DESC="Body desc"
+COM_USERS_FIELD_NOTEBODY_LABEL="Note"
+COM_USERS_FIELD_PUBLISHED_DESC="Published desc"
+COM_USERS_FIELD_PUBLISHED_LABEL="Published state"
+COM_USERS_FIELD_REVIEW_TIME_DESC="Desc"
+COM_USERS_FIELD_REVIEW_TIME_LABEL="Review time"
+COM_USERS_FIELD_SUBJECT_DESC="Desc"
+COM_USERS_FIELD_SUBJECT_LABEL="Subject"
+COM_USERS_FIELD_USER_ID_LABEL="ID"
+COM_USERS_FITLER_NOTES="Show notes list for this user"
COM_USERS_FILTER_ACTIVE="- Active -"
COM_USERS_FILTER_LABEL="Filter Users by:&#160;"
COM_USERS_FILTER_STATE="- State -"
@@ -107,6 +124,7 @@ COM_USERS_MASS_MAIL_DESC="Mass Mail options"
COM_USERS_N_LEVELS_DELETED="%d View Access Levels successfully removed."
COM_USERS_N_LEVELS_DELETED_0="No View Access Levels removed."
COM_USERS_N_LEVELS_DELETED_1="%d View Access Level successfully removed."
+COM_USERS_N_USER_NOTES="%d note(s)"
COM_USERS_N_USERS_ACTIVATED="%s Users successfully activated"
COM_USERS_N_USERS_ACTIVATED_0="No user activated"
COM_USERS_N_USERS_ACTIVATED_1="User successfully activated"
@@ -116,24 +134,33 @@ COM_USERS_N_USERS_BLOCKED_1="User blocked"
COM_USERS_N_USERS_UNBLOCKED="%s Users enabled"
COM_USERS_N_USERS_UNBLOCKED_0="No User enabled"
COM_USERS_N_USERS_UNBLOCKED_1="User enabled"
+COM_USERS_NEW_NOTE="New note"
+COM_USERS_NO_NOTES="No notes available for this user."
COM_USERS_NO_LEVELS_SELECTED="No Viewing Access Levels selected"
+COM_USERS_NOTE_N_SUBJECT="#%d %s"
+COM_USERS_NOTES="Notes"
+COM_USERS_NOTES_FOR_USER="Notes for user %s (ID #%d)"
COM_USERS_OPTION_LEVEL_CATEGORY="%d (top category)"
COM_USERS_OPTION_LEVEL_COMPONENT="%d (component)"
COM_USERS_OPTION_LEVEL_DEEPER="%d (deeper)"
COM_USERS_OPTION_SELECT_COMPONENT="- Select Component -"
COM_USERS_OPTION_SELECT_LEVEL_END="- Select End Level -"
COM_USERS_OPTION_SELECT_LEVEL_START="- Select Start Level -"
+COM_USERS_REVIEW_HEADING="Review date"
COM_USERS_SEARCH_ACCESS_LEVELS="Search Viewing Access Levels"
COM_USERS_SEARCH_ASSETS="Search Assets"
COM_USERS_SEARCH_GROUPS_LABEL="Search User Groups"
COM_USERS_SEARCH_IN_GROUPS="Search in title"
COM_USERS_SEARCH_IN_NAME="Search in name"
+COM_USERS_SEARCH_IN_NOTE_TITLE="Search in notes subject or user name."
COM_USERS_SEARCH_TITLE_LEVELS="Search for Access Levels."
COM_USERS_SEARCH_USERS="Search Users"
COM_USERS_SETTINGS_FIELDSET_LABEL="Basic Settings"
COM_USERS_SUBMENU_GROUPS="User Groups"
COM_USERS_SUBMENU_LEVELS="Viewing Access Levels"
+COM_USERS_SUBMENU_NOTES="User Notes"
COM_USERS_SUBMENU_USERS="Users"
+COM_USERS_SUBJECT_HEADING="Subject"
COM_USERS_TOOLBAR_ACTIVATE="Activate"
COM_USERS_TOOLBAR_BLOCK="Block"
COM_USERS_TOOLBAR_MAIL_SEND_MAIL="Send email"
@@ -170,6 +197,7 @@ COM_USERS_USER_FIELD_TIMEZONE_LABEL="Time Zone"
COM_USERS_USER_FIELD_USERNAME_DESC="Enter the login name (User name) for the user."
COM_USERS_USER_FIELD_USERNAME_LABEL="Login Name"
COM_USERS_USER_GROUPS_HAVING_ACCESS="User Groups Having Viewing Access"
+COM_USERS_USER_HEADING="User"
COM_USERS_USER_SAVE_FAILED="An error was encountered while saving the member: %s."
COM_USERS_USER_SAVE_SUCCESS="User successfully saved."
COM_USERS_USERGROUP_DETAILS="User Group Details"
@@ -191,6 +219,7 @@ COM_USERS_VIEW_LEVELS_TITLE="User Manager: Viewing Access Levels"
COM_USERS_VIEW_NEW_GROUP_TITLE="User Manager: Add New User Group"
COM_USERS_VIEW_NEW_LEVEL_TITLE="User Manager: Add New Viewing Access Level"
COM_USERS_VIEW_NEW_USER_TITLE="User Manager: Add New User"
+COM_USERS_VIEW_NOTES_TITLE="User Note"
COM_USERS_VIEW_USERS_TITLE="User Manager: Users"
COM_USERS_XML_DESCRIPTION="Component for managing users"
JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:<br /><em>Inherited</em> means that the permissions from global configuration and parent group will be used.<br /><em>Denied</em> means that no matter what the global configuration or parent group settings are, the group being edited cannot take this action on this component.<br /><em>Allowed</em> means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br />2. If you select a new setting, click <em>Save</em> to refresh the calculated settings."
View
2  installation/sql/mysql/sample_data.sql
@@ -6,7 +6,7 @@ TRUNCATE `#__assets`;
--
-- Dumping data for table `#__assets`
--
-INSERT INTO `jos_assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`)
+INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`)
VALUES
(1, 0, 1, 416, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
(2, 1, 2, 3, 1, 'com_admin', 'com_admin', '{}'),
Something went wrong with that request. Please try again.