Merge pull request #197 from adam-vessey/7.x

Fix a couple strings for translatability.

admin/islandora.admin.inc

@@ -81,7 +81,9 @@ function islandora_repository_admin($form, &$form_state) {
     '#type' => 'textfield',
     '#title' => t('Fedora base URL'),
     '#default_value' => variable_get('islandora_base_url', 'http://localhost:8080/fedora'),
-    '#description' => t('The URL to use for REST connections <br />' . $confirmation_message),
+    '#description' => t('The URL to use for REST connections <br /> !confirmation_message', array(
+      '!confirmation_message' => $confirmation_message,
+    )),
     '#required' => TRUE,
     '#ajax' => array(
       'callback' => 'islandora_update_url_div',
@@ -164,4 +166,4 @@ function islandora_update_namespace_div($form, $form_state) {
   $form_state['rebuild'] = TRUE;
 
   return $form['islandora_tabs']['islandora_namespace']['wrapper'];
-}
+}

includes/datastream.inc

@@ -388,7 +388,9 @@ function islandora_add_datastream_form($form, &$form_state, $object) {
   $form['add_fieldset']['stream_id'] = array(
     '#title' => 'Datastream ID',
     '#required' => 'TRUE',
-    '#description' => t('An ID for this stream that is unique to this object. Must start with a letter and contain only alphanumeric characters and dashes and underscores. Datastreams that are defined by the content model don\'t currently exist: <b>' . $dsids_for_form . '</b>.'),
+    '#description' => t('An ID for this stream that is unique to this object. Must start with a letter and contain only alphanumeric characters and dashes and underscores. Datastreams that are defined by the content model don\'t currently exist: <b>@unused_dsids</b>.', array(
+      '@unused_dsids' => $dsids_for_form,
+    )),
     '#type' => 'textfield',
     '#weight' => -1,
     '#autocomplete_path' => "islandora/object/$object->id/manage/datastreams/add/autocomplete",