';
$variables['user_relationships'] .=
- l('
' . t('Remove @rel_name', array('@name' => format_username($account), '@rel_name' => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name))) . '',
+ l('
' . t('Remove @rel_name', array('@name' => format_username($account)) + user_relationships_type_translations($relationship)) . '',
"user/{$user->uid}/relationships/{$relationship->rid}/remove",
array(
'query' => drupal_get_destination(),
@@ -74,13 +74,13 @@ function user_relationships_preprocess_author_pane(&$variables) {
}
$variables['user_relationships'] .= '
';
$variables['user_relationships'] .=
- l('' . t('Add @rel_name', array('@name' => format_username($account), '@rel_name' => ur_tt("user_relationships:rtid:$rtype->rtid:name", $rtype->name))) . '',
+ l('' . t('Add @rel_name', array('@name' => format_username($account)) + user_relationships_type_translations($relationship)) . '',
"relationship/{$account->uid}/request/{$rtype->rtid}",
array(
'query' => drupal_get_destination(),
'html' => TRUE,
'attributes' => array(
- 'title' => t('Become @name\'s @rel_name', array('@name' => format_username($account), '@rel_name' => ur_tt("user_relationships:rtid:$rtype->rtid:name", $rtype->name))),
+ 'title' => t('Become @name\'s @rel_name', array('@name' => format_username($account)) + user_relationships_type_translations($rtype)),
'class' => $css_class
),
)
diff --git a/user_relationships.install b/user_relationships.install
index df435cc..952bd84 100644
--- a/user_relationships.install
+++ b/user_relationships.install
@@ -32,11 +32,41 @@ function user_relationships_schema() {
'fields' => array(
'rtid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
'name' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
- 'plural_name' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
+ 'plural_name' => array('type' => 'varchar', 'length' => 255, 'default' => ''),
'is_oneway' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
'is_reciprocal' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
'requires_approval' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
'expires_val' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
+ 'reverse_name' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'default' => '',
+ ),
+ 'name_capitalized' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'default' => '',
+ ),
+ 'plural_name_capitalized' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'default' => '',
+ ),
+ 'reverse_name_capitalized' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'default' => '',
+ ),
+ 'reverse_plural_name' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'default' => '',
+ ),
+ 'reverse_plural_name_capitalized' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'default' => '',
+ ),
),
'unique keys' => array(
'name' => array('name'),
@@ -128,3 +158,45 @@ function user_relationships_update_7004() {
db_drop_index('user_relationships', 'rtid');
db_add_index('user_relationships', 'relationship', array('requester_id', 'requestee_id'));
}
+
+/*
+ * Add table columns for reversed and capitalized names.
+ */
+function user_relationships_update_7005() {
+ $fields = array(
+ 'reverse_name' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'default' => '',
+ ),
+ 'name_capitalized' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'default' => '',
+ ),
+ 'plural_name_capitalized' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'default' => '',
+ ),
+ 'reverse_name_capitalized' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'default' => '',
+ ),
+ 'reverse_plural_name' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'default' => '',
+ ),
+ 'reverse_plural_name_capitalized' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'default' => '',
+ ),
+ );
+
+ foreach ($fields as $field => $definition) {
+ db_add_field('user_relationship_types', $field, $definition);
+ }
+}
diff --git a/user_relationships.module b/user_relationships.module
index 1a00c9d..ef97ab1 100644
--- a/user_relationships.module
+++ b/user_relationships.module
@@ -11,6 +11,10 @@
define('UR_OK', 0x0);
define('UR_BANNED', 0x1);
+define('USER_RELATIONSHIPS_NAME_PLURAL', 1);
+define('USER_RELATIONSHIPS_NAME_CAPITAL', 2);
+define('USER_RELATIONSHIPS_NAME_REVERSE', 4);
+
function user_relationships_menu() {
$items['admin/config/people/relationships'] = array(
'title' => 'Relationships',
@@ -43,6 +47,25 @@ function user_relationships_menu() {
'file' => 'user_relationships.admin.inc',
'weight' => 5,
);
+ if (module_exists('i18n_string')) {
+ $items['admin/config/people/relationships/%user_relationships_type/translate'] = array(
+ 'title' => 'Translate',
+ 'access callback' => 'user_relationships_translate_tab_access',
+ 'page callback' => 'user_relationships_translate_tab_page',
+ 'file' => 'user_relationships.admin.inc',
+ 'page arguments' => array(4),
+ 'type' => MENU_LOCAL_TASK,
+ 'weight' => 10,
+ );
+ $items['admin/config/people/relationships/%user_relationships_type/translate/%language'] = array(
+ 'title' => 'Translate',
+ 'access callback' => 'user_relationships_translate_tab_access',
+ 'page callback' => 'user_relationships_translate_tab_page',
+ 'file' => 'user_relationships.admin.inc',
+ 'page arguments' => array(4, 6),
+ 'type' => MENU_CALLBACK,
+ );
+ }
$items['admin/config/people/relationships/%user_relationships_type/delete'] = array(
'title' => 'Delete type',
'type' => MENU_LOCAL_TASK,
@@ -50,7 +73,7 @@ function user_relationships_menu() {
'page arguments' => array('user_relationships_admin_type_delete', 4),
'access arguments' => array('administer user relationships'),
'file' => 'user_relationships.admin.inc',
- 'weight' => 10,
+ 'weight' => 15,
);
$items['admin/config/people/relationships/settings'] = array(
'title' => 'Settings',
@@ -92,6 +115,14 @@ function user_relationships_setting_validation($element, $validations) {
}
/**
+ * Menu access callback function.
+ */
+function user_relationships_translate_tab_access() {
+ return user_access('translate interface') && user_access('administer user relationships');
+}
+
+
+/**
* Helper function to generate the main and count queries from a list of parameters and options
*/
function _user_relationships_generate_query($param = array(), $options = array()) {
@@ -351,18 +382,6 @@ function user_relationships_user_cancel($edit, $account, $method) {
}
/**
- * Wrapper function for tt() if i18nstrings enabled.
- */
-function ur_tt($name, $string, $langcode = NULL, $update = FALSE) {
- if (module_exists('i18nstrings')) {
- return tt($name, $string, $langcode, $update);
- }
- else {
- return $string;
- }
-}
-
-/**
* Implements hook_activity_info().
*/
function user_relationships_activity_info() {
@@ -461,17 +480,27 @@ function user_relationships_types_load($reset = FALSE) {
* A User Relationship type object
*/
function user_relationships_type_save($rtype) {
+
+ // #348025 when editing a type, make sure that two-way relationships are not
+ // left as reciprocal, just in case, as the UI allows it.
+ if (empty($rtype->is_oneway)) {
+ $rtype->is_reciprocal = 0;
+ }
+
+ // Ensure "expires_val" is numeric and not negative.
+ if (!isset($rtype->expires_val) || !is_numeric($rtype->expires_val) || $rtype->expires_val < 0) {
+ $rtype->expires_val = 0;
+ }
+
module_invoke_all('user_relationships_type_presave', $rtype);
$op = (isset($rtype->rtid) && $rtype->rtid) ? 'update' : 'insert';
- // find a relationship type with the name we're trying to save
+ // Find a relationship type with the name we're trying to save
// if it's an update action check to see that the rtypes match
- // otherwise it's just invalid
- if (
- ($found_rt = user_relationships_type_load(array('name' => $rtype->name))) &&
- ($op == 'update' ? $found_rt->rtid != $rtype->rtid : TRUE)
- ) {
+ // otherwise it's just invalid.
+ $found_rt = user_relationships_type_load(array('name' => $rtype->name));
+ if ($found_rt && (($op == 'update' && $found_rt->rtid != $rtype->rtid) || $op == 'insert')) {
return FALSE;
}
@@ -483,6 +512,13 @@ function user_relationships_type_save($rtype) {
drupal_write_record('user_relationship_types', $rtype, ($op == 'update' ? 'rtid' : array()));
module_invoke_all('user_relationships_type_' . $op, $rtype);
+
+ user_relationships_types_load(TRUE);
+
+ // Update strings for translation.
+ _user_relationships_update_translations($rtype);
+
+ menu_rebuild();
}
@@ -547,14 +583,14 @@ function user_relationships_request_relationship($requester, $requestee = NULL,
//check requester is allowed to create this rtype
if (!user_relationships_can_request($requester, $type)) {
- watchdog('user_relationships', 'User %user has no suitable roles to request a %rtype relationship', array('%user' => format_username($requester), '%rtype' => $type->name), WATCHDOG_WARNING);
+ watchdog('user_relationships', 'User %user has no suitable roles to request a %rtype relationship', array('%user' => format_username($requester), '%rtype' => user_relationships_type_get_name($type)), WATCHDOG_WARNING);
//it would be good to return a reason why save is denied, but it's the API portion, it does not expose anything user-visible
return FALSE;
}
//check requestee is allowed to receive this rtype
if (!user_relationships_can_receive($requestee, $type)) {
- watchdog('user_relationships', 'User %user has no suitable roles to receive a %rtype relationship', array('%user' => format_username($requestee), '%rtype' => $type->name), WATCHDOG_WARNING);
+ watchdog('user_relationships', 'User %user has no suitable roles to receive a %rtype relationship', array('%user' => format_username($requestee), '%rtype' => user_relationships_type_get_name($type)), WATCHDOG_WARNING);
//it would be good to return a reason why save is denied, but it's the API portion, it does not expose anything user-visible
return FALSE;
}
@@ -930,19 +966,10 @@ function user_relationships_get_message($key, $relationship = NULL, $replacement
if (!isset($relationship->requestee)) {
$relationship->requestee = user_load($relationship->requestee_id);
}
- if (!(isset($relationship->name) || isset($relationship->type))) {
- $relationship->type = user_relationships_type_load($relationship->rtid);
- }
- $replaceables = array(
+ $replaceables = user_relationships_type_translations(user_relationships_type_load($relationship->rtid)) + array(
'!requester' => theme('username', array('account' => $relationship->requester)),
'!requestee' => theme('username', array('account' => $relationship->requestee)),
- '%relationship_name' => isset($relationship->name)
- ? ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name)
- : ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->type->name),
- '%relationship_plural_name' => isset($relationship->plural_name)
- ? ur_tt("user_relationships:rtid:$relationship->rtid:plural_name", $relationship->plural_name)
- : ur_tt("user_relationships:rtid:$relationship->rtid:plural_name", $relationship->type->plural_name),
);
$replacements = array_merge($replaceables, $replacements);
}
@@ -966,27 +993,27 @@ function user_relationships_get_message($key, $relationship = NULL, $replacement
function _user_relationships_default_messages($replacements) {
return array(
'informational' => array(
- 'submitted' => t('Your %relationship_name request has been sent to !requestee.', $replacements),
- 'accepted' => t("!requester's %relationship_name request has been approved.", $replacements),
- 'disapproved' => t("!requester has declined your %relationship_name request.", $replacements),
- 'disapprove' => t("!requester's %relationship_name request has been declined.", $replacements),
- 'cancel' => t('Your %relationship_name request to !requestee has been canceled.', $replacements),
+ 'submitted' => t('Your @rel_name request has been sent to !requestee.', $replacements),
+ 'accepted' => t("!requester's @rel_name request has been approved.", $replacements),
+ 'disapproved' => t("!requester has declined your @rel_name request.", $replacements),
+ 'disapprove' => t("!requester's @rel_name request has been declined.", $replacements),
+ 'cancel' => t('Your @rel_name request to !requestee has been canceled.', $replacements),
'default' => t('No action has been taken.'),
- 'removed' => t('The %relationship_name relationship between !requester and !requestee has been deleted.', $replacements),
- 'pending' => t('!requester has requested to be your %relationship_name. View your !pending_relationship_requests to approve or decline.', $replacements),
- 'pre_approved' => t("You are !requestee's newest %relationship_name.", $replacements),
+ 'removed' => t('The @rel_name relationship between !requester and !requestee has been deleted.', $replacements),
+ 'pending' => t('!requester has requested to be your @rel_name. View your !pending_relationship_requests to approve or decline.', $replacements),
+ 'pre_approved' => t("You are !requestee's newest @rel_name.", $replacements),
),
'error' => array(
'too_many_relationships' => t('You are not permitted to create any more relationships with this user.'),
- 'existing_request' => t('There is already an earlier %relationship_name request sent to !requestee.', $replacements),
- 'existing_relationship' => t('There is already an existing %relationship_name relationship with !requestee.', $replacements),
+ 'existing_request' => t('There is already an earlier @rel_name request sent to !requestee.', $replacements),
+ 'existing_relationship' => t('There is already an existing @rel_name relationship with !requestee.', $replacements),
'not_accepting_requests' => t('This user does not accept relationship requests.'),
'self_request' => t('You cannot create a relationship with yourself.'),
'non_existent_user' => t('This user does not exist.'),
'non_existent_type' => t('This relationship type does not exist.'),
'unknown_error' => t('An error has occurred. Please contact the site administrator.'),
'relationship_type_not_set' => t('Please choose the type of relationship.'),
- 'relationship_type_not_allowed' => t('You may not create %relationship_name relationships.', $replacements),
+ 'relationship_type_not_allowed' => t('You may not create @rel_name relationships.', $replacements),
),
);
}
@@ -1037,13 +1064,73 @@ function _user_relationships_get_from_array($needle, &$haystack) {
}
/**
- * Implements hook_locale().
+ * Implements hook_i18n_string_info().
+ */
+function user_relationships_i18n_string_info() {
+ return array(
+ 'user_relationships' => array(
+ 'title' => t('User Relationships'),
+ 'description' => t('Translations for relationship type names'),
+ 'format' => FALSE,
+ 'list' => TRUE,
+ ),
+ );
+}
+
+function user_relationships_i18n_string_list($group) {
+ if ($group == 'all' || $group == 'user_relationships') {
+ $strings = array();
+ foreach (user_relationships_types_load() as $type) {
+ $strings['user_relationships']['rtid'][$type->rtid]['name'] = $type->name;
+ $strings['user_relationships']['rtid'][$type->rtid]['plural_name'] = $type->plural_name;
+ $strings['user_relationships']['rtid'][$type->rtid]['name_capitalized'] = $type->name_capitalized;
+ $strings['user_relationships']['rtid'][$type->rtid]['plural_name_capitalized'] = $type->plural_name_capitalized;
+ $strings['user_relationships']['rtid'][$type->rtid]['reverse_name'] = $type->reverse_name;
+ $strings['user_relationships']['rtid'][$type->rtid]['reverse_plural_name'] = $type->reverse_plural_name;
+ $strings['user_relationships']['rtid'][$type->rtid]['reverse_name_capitalized'] = $type->reverse_name_capitalized;
+ $strings['user_relationships']['rtid'][$type->rtid]['reverse_plural_name_capitalized'] = $type->reverse_plural_name_capitalized;
+ }
+ return $strings;
+ }
+}
+
+/**
+ * Gets the relationship type name.
*/
-function user_relationships_ui_locale($op = 'groups') {
- switch ($op) {
- case 'groups':
- return array('user_relationships' => t('User Relationships'));
+function user_relationships_type_get_name($type, $plural = FALSE, $reversed = FALSE, $capitalized = FALSE) {
+ if (is_string($type)) {
+ $type = user_relationships_type_load($type);
+ }
+
+ // Start with just name as the name and then add suffixes and prefixes
+ // according to the given flags.
+ $name = 'name';
+ if ($plural) {
+ $name = 'plural_' . $name;
+ }
+
+ if ($reversed) {
+ $name = 'reverse_' . $name;
}
+
+ if ($capitalized) {
+ $name .= '_capitalized';
+ }
+
+ $name_value = !empty($type->$name) ? $type->$name : $type->name;
+ if (function_exists('i18n_string_translate')) {
+ $name_value = i18n_string_translate(array('user_relationships', 'rtid', $type->rtid, $name), $name_value);
+ }
+ return $name_value;
+}
+
+function user_relationships_type_translations($relationship_type) {
+ return array(
+ '@rel_name' => user_relationships_type_get_name($relationship_type),
+ '@rel_name_plural' => user_relationships_type_get_name($relationship_type, TRUE),
+ '@Rel_name' => user_relationships_type_get_name($relationship_type, FALSE, FALSE, TRUE),
+ '@Rel_name_plural' => user_relationships_type_get_name($relationship_type, TRUE, FALSE, TRUE),
+ );
}
/**
@@ -1054,7 +1141,7 @@ function user_relationships_autocomplete_types($string = '') {
if ($string) {
$result = db_query_range("SELECT rtid, name FROM {user_relationship_types} WHERE LOWER(name) LIKE LOWER(:string)", 0, 10, array(':string' => '%' . strtolower($string) . '%'));
foreach ($result as $relationship) {
- $matches[$relationship->name] = check_plain(ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name));
+ $matches[$relationship->name] = check_plain(user_relationships_type_get_name($relationship));
}
}
print drupal_json_output($matches);
@@ -1107,7 +1194,7 @@ function user_relationships_get_requestable_rtypes($requester, $requestee, $retu
}
}
if ($return == 'name') {
- $relationships[$rtype->rtid] = ur_tt("user_relationships:rtid:$rtype->rtid:name", $rtype->name);
+ $relationships[$rtype->rtid] = user_relationships_type_get_name($rtype);
}
else {
$relationships[$rtype->rtid] = $rtype;
@@ -1115,3 +1202,21 @@ function user_relationships_get_requestable_rtypes($requester, $requestee, $retu
}
return $relationships;
}
+
+/**
+ * Make relationship type available to translation by i18n_string.module
+ */
+function _user_relationships_update_translations($relationship_type) {
+ if (function_exists('i18n_string_update') && $relationship_type->rtid) {
+ $rtid = $relationship_type->rtid;
+ i18n_string_update("user_relationships:rtid:$rtid:name", $relationship_type->name);
+ i18n_string_update("user_relationships:rtid:$rtid:plural_name", $relationship_type->plural_name);
+ i18n_string_update("user_relationships:rtid:$rtid:name_capitalized", $relationship_type->name_capitalized);
+ i18n_string_update("user_relationships:rtid:$rtid:plural_name_capitalized", $relationship_type->plural_name_capitalized);
+ i18n_string_update("user_relationships:rtid:$rtid:reverse_name", $relationship_type->reverse_name);
+ i18n_string_update("user_relationships:rtid:$rtid:reverse_plural_name", $relationship_type->reverse_plural_name);
+ i18n_string_update("user_relationships:rtid:$rtid:reverse_name_capitalized", $relationship_type->reverse_name_capitalized);
+ i18n_string_update("user_relationships:rtid:$rtid:reverse_plural_name_capitalized", $relationship_type->reverse_plural_name_capitalized);
+ }
+}
+
diff --git a/user_relationships.test b/user_relationships.test
index b05da71..065beb6 100644
--- a/user_relationships.test
+++ b/user_relationships.test
@@ -483,3 +483,55 @@ class UserRelationshipsTestCase extends UserRelationshipsBaseTestCase {
$this-> assertFalse($rtype->is_reciprocal);
}
}
+
+/**
+ * User Relationship type tests.
+ */
+class UserRelationshipsTypesTestCase extends DrupalWebTestCase {
+
+ /**
+ * Implements getInfo().
+ */
+ function getInfo() {
+ return array(
+ 'name' => t('User Relationships Types'),
+ 'description' => t('Checks various user relationship types functions.'),
+ 'group' => t('User Relationships'),
+ );
+ }
+
+ /**
+ * Enable modules.
+ */
+ function setUp() {
+ parent::setUp('user_relationships');
+ }
+
+ function testNames() {
+ // Create relationship type.
+ $relationship_type = (object)array(
+ 'name' => $this->randomName(),
+ 'plural_name' => $this->randomName(),
+ 'reverse_name' => $this->randomName(),
+ 'reverse_plural_name' => $this->randomName(),
+ 'name_capitalized' => $this->randomName(),
+ 'plural_name_capitalized' => $this->randomName(),
+ 'reverse_name_capitalized' => $this->randomName(),
+ 'reverse_plural_name_capitalized' => $this->randomName(),
+ 'requires_approval' => FALSE,
+ 'expires_val' => 0,
+ );
+
+ // First, check all names.
+ $this->assertEqual($relationship_type->name, user_relationships_type_get_name($relationship_type));
+ $this->assertEqual($relationship_type->plural_name, user_relationships_type_get_name($relationship_type, TRUE));
+ $this->assertEqual($relationship_type->reverse_name, user_relationships_type_get_name($relationship_type, FALSE, TRUE));
+ $this->assertEqual($relationship_type->reverse_plural_name, user_relationships_type_get_name($relationship_type, TRUE, TRUE));
+ $this->assertEqual($relationship_type->name_capitalized, user_relationships_type_get_name($relationship_type, FALSE, FALSE, TRUE));
+ $this->assertEqual($relationship_type->plural_name_capitalized, user_relationships_type_get_name($relationship_type, TRUE, FALSE, TRUE));
+ $this->assertEqual($relationship_type->reverse_name_capitalized, user_relationships_type_get_name($relationship_type, FALSE, TRUE, TRUE));
+ $this->assertEqual($relationship_type->reverse_plural_name_capitalized, user_relationships_type_get_name($relationship_type, TRUE, TRUE, TRUE));
+
+ // @todo: Test fallback strategy.
+ }
+}
diff --git a/user_relationships_ui/user_relationships_ui.forms.inc b/user_relationships_ui/user_relationships_ui.forms.inc
index 2c6f746..f253653 100644
--- a/user_relationships_ui/user_relationships_ui.forms.inc
+++ b/user_relationships_ui/user_relationships_ui.forms.inc
@@ -135,8 +135,8 @@ function user_relationships_ui_request($form, &$form_state, $requestee) {
$dest,
isset($relationship) ?
($relationship->requires_approval
- ? t('Are you sure you want to send a new %rel_name request to !name?', array('%rel_name' => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name), '%rel_plural_name' => ur_tt("user_relationships:rtid:$relationship->rtid:plural_name", $relationship->plural_name), '!name' => theme('username', array('account' => $requestee))))
- : t("Are you sure you want to become !name's %rel_name?", array('!name' => theme('username', array('account' => $requestee)), '%rel_name' => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name)))) :
+ ? t('Are you sure you want to send a new @rel_name request to !name?', array('!name' => theme('username', array('account' => $requestee))) + user_relationships_type_translations($relationship))
+ : t("Are you sure you want to become !name's @rel_name?", array('!name' => theme('username', array('account' => $requestee))) + user_relationships_type_translations($relationship))) :
'',
t('Send'), t('Cancel'),
'user_relationships_request_confirm'
@@ -182,29 +182,26 @@ function user_relationships_ui_pending_requested($form, &$form_state, $action, $
//pick the correct question message: approve and disapprove are requests to current user, cancel is a request from current user
switch ($action) {
case 'approve':
- $confirmation_message = t('Are you sure you want to approve the %relationship_name relationship request from !name?', array(
+ $confirmation_message = t('Are you sure you want to approve the @rel_name relationship request from !name?', array(
'@action' => $action,
- '%relationship_name' => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name),
'!name' => theme('username', array('account' => user_load(($viewed_id == $relationship->requester_id ? $relationship->requestee_id : $relationship->requester_id))))
- ));
+ ) + user_relationships_type_translations($relationship));
$action_message = t('Approve relationship');
$request_url = 'relationships/received';
break;
case 'disapprove':
- $confirmation_message = t('Are you sure you want to decline the %relationship_name relationship request from !name?', array(
+ $confirmation_message = t('Are you sure you want to decline the @rel_name relationship request from !name?', array(
'@action' => $action,
- '%relationship_name' => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name),
'!name' => theme('username', array('account' => user_load(($viewed_id == $relationship->requester_id ? $relationship->requestee_id : $relationship->requester_id))))
- ));
+ ) + user_relationships_type_translations($relationship));
$action_message = t('Decline relationship');
$request_url = 'relationships/received';
break;
default:
- $confirmation_message = t('Are you sure you want to cancel your %relationship_name relationship request to !name?', array(
+ $confirmation_message = t('Are you sure you want to cancel your @rel_name relationship request to !name?', array(
'@action' => $action,
- '%relationship_name' => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name),
'!name' => theme('username', array('account' => user_load(($viewed_id == $relationship->requester_id ? $relationship->requestee_id : $relationship->requester_id))))
- ));
+ ) + user_relationships_type_translations($relationship));
$action_message = t('Cancel relationship');
$request_url = 'relationships/sent';
}
@@ -280,10 +277,9 @@ function user_relationships_ui_remove($form, &$form_state, $account, $relationsh
$form,
t('Remove relationship'),
$dest,
- t("Are you sure you want to delete the %relationship_name relationship with !name?", array(
- '%relationship_name' => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name),
- '!name' => theme('username', array('account' => user_load(($viewed_id == $relationship->requester_id ? $relationship->requestee_id : $relationship->requester_id))))
- )),
+ t("Are you sure you want to delete the @rel_name relationship with !name?", array(
+ '!name' => theme('username', array('account' => user_load(($viewed_id == $relationship->requester_id ? $relationship->requestee_id : $relationship->requester_id))))
+ ) + user_relationships_type_translations($relationship)),
t('Yes'), t('No'),
'user_relationships_remove_confirm'
);
diff --git a/user_relationships_ui/user_relationships_ui.module b/user_relationships_ui/user_relationships_ui.module
index 915326f..1379954 100644
--- a/user_relationships_ui/user_relationships_ui.module
+++ b/user_relationships_ui/user_relationships_ui.module
@@ -60,10 +60,9 @@ function user_relationships_ui_actions_between($viewer, $viewed, $action_types =
if (isset($action_types['requested'])) {
$relationships = user_relationships_load(array('requester_id' => $viewer->uid, 'requestee_id' => $viewed->uid, 'approved' => FALSE));
foreach ($relationships as $relationship) {
- $list[] = t('You have sent a new %relationship_name request to this user. (!pending_requests)', array(
- '%relationship_name' => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name),
+ $list[] = t('You have sent a new @rel_name request to this user. (!pending_requests)', array(
'!pending_requests' => l(t('pending requests'), "relationships/sent"),
- ));
+ ) + user_relationships_type_translations($relationship));
}
}
@@ -71,10 +70,9 @@ function user_relationships_ui_actions_between($viewer, $viewed, $action_types =
$relationships = user_relationships_load(array('requester_id' => $viewed->uid, 'requestee_id' => $viewer->uid, 'approved' => FALSE));
foreach ($relationships as $relationship) {
if (user_relationships_user_access('maintain @relationship relationships', $relationship)) {
- $list[] = t('This user has requested to be your %relationship_name. (!pending_requests)', array(
- '%relationship_name' => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name),
- '!pending_requests' => l(t('pending requests'), "user/{$viewer->uid}/relationships/received"),
- ));
+ $list[] = t('This user has requested to be your @rel_name. (!pending_requests)', array(
+ '!pending_requests' => l(t('pending requests'), "user/{$viewer->uid}/relationships/received"),
+ ) + user_relationships_type_translations($relationship));
}
}
}
@@ -101,13 +99,13 @@ function user_relationships_ui_actions_between($viewer, $viewed, $action_types =
foreach ($relationships as $relationship) {
if ($relationship->approved && !isset($list[$relationship->rid]) && user_relationships_ui_check_access('view', NULL, $relationship)) {
if (user_relationships_ui_check_access('delete', NULL, $relationship)) {
- $list[$relationship->rid] = t('%relationship_name (!remove_link)', array(
- '%relationship_name' => ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name) . ($relationship->is_oneway ? ($relationship->requester_id == $viewer->uid ? t(' (You to Them)') : t(' (Them to You)')) : NULL),
+ $list[$relationship->rid] = t('@rel_name (!remove_link)', array(
+ '@rel_name' => user_relationships_type_get_name($relationship) . ($relationship->is_oneway ? ($relationship->requester_id == $viewer->uid ? t(' (You to Them)') : t(' (Them to You)')) : NULL),
'!remove_link' => theme('user_relationships_remove_link', array('uid' => $viewer->uid, 'rid' => $relationship->rid)),
));
}
else {
- $list[$relationship->rid] = ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name) . ($relationship->is_oneway ? ($relationship->requester_id == $viewer->uid ? t(' (You to Them)') : t(' (Them to You)')) : NULL);
+ $list[$relationship->rid] = user_relationships_type_get_name($relationship) . ($relationship->is_oneway ? ($relationship->requester_id == $viewer->uid ? t(' (You to Them)') : t(' (Them to You)')) : NULL);
}
}
}
@@ -116,7 +114,6 @@ function user_relationships_ui_actions_between($viewer, $viewed, $action_types =
return $list;
}
-
/**********************************
* CALLBACKS
**********************************/
@@ -300,7 +297,8 @@ function user_relationships_ui_menu() {
foreach (user_relationships_types_load() as $rtid => $relationship) {
if (isset($show_tabs[$rtid])) {
$items["relationships/{$rtid}"] = array(
- 'title' => $relationship->plural_name ? $relationship->plural_name : $relationship->name,
+ 'title' => $relationship->rtid,
+ 'title callback' => 'user_relationships_ui_title_callback',
'type' => MENU_LOCAL_TASK,
'access callback' => 'user_relationships_ui_check_access',
'access arguments' => array('view', NULL, 1),
@@ -376,7 +374,8 @@ function user_relationships_ui_menu() {
);
foreach (user_relationships_types_load() as $rtid => $relationship) {
$items["user/%user/relationships/{$rtid}"] = array(
- 'title' => $relationship->plural_name ? $relationship->plural_name : $relationship->name,
+ 'title' => $relationship->rtid,
+ 'title callback' => 'user_relationships_ui_title_callback',
'type' => MENU_LOCAL_TASK,
'access callback' => 'user_relationships_ui_check_access',
'access arguments' => array('view', 1, 3),
@@ -409,6 +408,10 @@ function user_relationships_ui_menu() {
return $items;
}
+function user_relationships_ui_title_callback($rtid) {
+ return user_relationships_type_get_name(user_relationships_type_load($rtid), TRUE, FALSE, TRUE);
+}
+
/**
* Title callback to display the amount of pending requests.
* @param $column
@@ -517,7 +520,7 @@ function user_relationships_ui_form_alter(&$form, &$form_state, $form_id) {
$options = array();
foreach ($relationships as $relationship) {
if ($relationship->requires_approval && user_relationships_ui_check_access('approve', NULL, $relationship)) {
- $options[$relationship->rtid] = ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name);
+ $options[$relationship->rtid] = user_relationships_type_get_name($relationship);
}
}
diff --git a/user_relationships_ui/user_relationships_ui.pages.inc b/user_relationships_ui/user_relationships_ui.pages.inc
index b685fa0..e2209fd 100644
--- a/user_relationships_ui/user_relationships_ui.pages.inc
+++ b/user_relationships_ui/user_relationships_ui.pages.inc
@@ -41,12 +41,12 @@ function user_relationships_page($account = NULL, $rtid = NULL) {
if ($account->uid == $user->uid) {
$msg = isset($relationship_type)
- ? t("My %relationships", array('%relationships' => $relationship_type->plural_name ? ur_tt("user_relationships:rtid:" . $relationship_type->rtid . ":plural_name", $relationship_type->plural_name) : ur_tt("user_relationships:rtid:" . $relationship_type->rtid . ":name", $relationship_type->name)))
+ ? t("My @rel_name_plural", user_relationships_type_translations($relationship_type))
: t("My relationships");
}
else {
$msg = isset($relationship_type)
- ? t("%username's %relationships", array('%username' => format_username($account), '%relationships' => $relationship_type->plural_name ? ur_tt("user_relationships:rtid:" . $relationship_type->rtid . ":plural_name", $relationship_type->plural_name) : ur_tt("user_relationships:rtid:" . $relationship_type->rtid . ":name", $relationship_type->name)))
+ ? t("%username's @rel_name", array('%username' => format_username($account)) + user_relationships_type_translations($relationship_type))
: t("%username's relationships", array('%username' => format_username($account)));
}
drupal_set_title($msg, PASS_THROUGH);
@@ -63,7 +63,7 @@ function user_relationships_page($account = NULL, $rtid = NULL) {
}
if (!empty($rtid)) {
- $empty = t('You do not have any %plural_name.', array('%plural_name' => ur_tt("user_relationships:rtid:$relationship_type->rtid:plural_name", $relationship_type->plural_name)));
+ $empty = t('You do not have any %rel_plural_name.', user_relationships_type_translations($relationship_type));
}
else {
$empty = t('You do not have any relationships with other users.');
@@ -174,7 +174,7 @@ function user_relationships_ui_get_table_row($relationship, $account) {
$row = array(
theme('username', array('account' => $this_user)),
- ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name) . ($relationship->is_oneway ? ($this_user_str == 'requestee' ? t(' (You to Them)') : t(' (Them to You)')) : NULL),
+ user_relationships_type_get_name($relationship, FALSE, $relationship->is_oneway && $this_user_str == 'requester'),
);
$permission = $account->uid == $relationship->requestee_id ? 'request' : 'approve';
diff --git a/user_relationships_ui/user_relationships_ui.theme.inc b/user_relationships_ui/user_relationships_ui.theme.inc
index 648e4b2..858b58e 100644
--- a/user_relationships_ui/user_relationships_ui.theme.inc
+++ b/user_relationships_ui/user_relationships_ui.theme.inc
@@ -39,7 +39,7 @@ function theme_user_relationships_request_relationship_direct_link($variables) {
return theme('user_relationships_request_relationship_link', array('relate_to' => $relate_to));
}
return l(
- t("Become %name's %rel_name", array('%name' => format_username($relate_to), '%rel_name' => ur_tt("user_relationships:rtid:$relationship_type->rtid:name", $relationship_type->name), '%rel_plural_name' => ur_tt("user_relationships:rtid:$relationship_type->rtid:plural_name", $relationship_type->plural_name))),
+ t("Become %name's @rel_name", array('%name' => format_username($relate_to)) + user_relationships_type_translations($relationship_type)),
"relationship/{$relate_to->uid}/request/{$relationship_type->rtid}",
array(
'query' => drupal_get_destination(),