From c7d54b57e94f3bf51803dea3d3f5008403310d5c Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Thu, 1 Nov 2012 17:01:15 -0300 Subject: [PATCH] Fix a couple strings for translatability. Never concatenate inside of t()! --- admin/islandora.admin.inc | 6 ++++-- includes/datastream.inc | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/admin/islandora.admin.inc b/admin/islandora.admin.inc index e3aeb60c..f0e6ddcf 100644 --- a/admin/islandora.admin.inc +++ b/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
' . $confirmation_message), + '#description' => t('The URL to use for REST connections
!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']; -} \ No newline at end of file +} diff --git a/includes/datastream.inc b/includes/datastream.inc index d6596490..ba986c12 100644 --- a/includes/datastream.inc +++ b/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: ' . $dsids_for_form . '.'), + '#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: @unused_dsids.', array( + '@unused_dsids' => $dsids_for_form, + )), '#type' => 'textfield', '#weight' => -1, '#autocomplete_path' => "islandora/object/$object->id/manage/datastreams/add/autocomplete",