Merge pull request #381 from Gizra/1865860

Issues with multiple entity types as groups
Gizra · Jun 20, 2018 · 983ce45 · 983ce45
2 parents f0139ce + cfee781
commit 983ce45
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/og.module b/og.module
@@ -671,7 +671,15 @@ function og_field_create_instance($instance) {
 
   $og_field = og_fields_info(OG_AUDIENCE_FIELD);
   $og_field['field']['settings']['target_type'] = $entity_type;
-  $og_field['instance']['label'] = t('Group membership');
+  if ($entity_type == 'node') {
+    $og_field['instance']['label'] = t('Group membership');
+  }
+  else {
+    $entity_info = entity_get_info($entity_type);
+    $og_field['instance']['label'] = t('@label group membership', array(
+      '@label' => $entity_info['label'],
+    ));
+  }
 
   // If the user entity type has multiple bundles, make sure to attach a field
   // instance to all of them.