From f65076b93d91fe9718cf9bef37638d64290b9f28 Mon Sep 17 00:00:00 2001 From: Paul Arthur Date: Sat, 31 Mar 2012 17:01:04 -0400 Subject: Switch from _() to T_() Even if we move away from php-gettext in the future, it's easy to write a quick T_() as a simple wrapper; it's not so easy to rewrite PHP to allow redeclaration of a function. --- templates/browse_filters.inc.php | 22 ++++---- templates/error_page.inc.php | 6 +-- templates/footer.inc.php | 4 +- templates/header.inc.php | 10 ++-- templates/install_header.inc.php | 12 ++--- templates/list_header.inc.php | 4 +- templates/rightbar.inc.php | 26 +++++----- templates/show_access_list.inc.php | 38 +++++++------- templates/show_account.inc.php | 12 ++--- templates/show_add_access.inc.php | 38 +++++++------- templates/show_add_access_current.inc.php | 24 ++++----- templates/show_add_access_local.inc.php | 36 ++++++------- templates/show_add_access_rpc.inc.php | 36 ++++++------- templates/show_add_catalog.inc.php | 48 +++++++++--------- templates/show_add_live_stream.inc.php | 16 +++--- templates/show_add_playlist.inc.php | 8 +-- templates/show_add_shout.inc.php | 8 +-- templates/show_add_user.inc.php | 26 +++++----- templates/show_adds_catalog.inc.php | 8 +-- templates/show_admin_info.inc.php | 6 +-- templates/show_admin_tools.inc.php | 56 ++++++++++----------- templates/show_album.inc.php | 30 +++++------ templates/show_album_art.inc.php | 8 +-- templates/show_album_row.inc.php | 10 ++-- templates/show_albums.inc.php | 38 +++++++------- templates/show_all_popular.inc.php | 12 ++--- templates/show_artist.inc.php | 28 +++++------ templates/show_artist_row.inc.php | 8 +-- templates/show_artists.inc.php | 34 ++++++------- templates/show_big_art.inc.php | 4 +- templates/show_catalog_row.inc.php | 12 ++--- templates/show_catalogs.inc.php | 26 +++++----- templates/show_clean_catalog.inc.php | 6 +-- templates/show_confirmation.inc.php | 4 +- templates/show_create_democratic.inc.php | 26 +++++----- templates/show_debug.inc.php | 40 +++++++-------- templates/show_democratic.inc.php | 16 +++--- templates/show_democratic_playlist.inc.php | 36 ++++++------- templates/show_denied.inc.php | 12 ++--- templates/show_disabled_songs.inc.php | 28 +++++------ templates/show_duplicate.inc.php | 14 +++--- templates/show_duplicates.inc.php | 36 ++++++------- templates/show_dynamic.inc.php | 22 ++++---- templates/show_edit_access.inc.php | 36 ++++++------- templates/show_edit_album.inc.php | 10 ++-- templates/show_edit_album_row.inc.php | 4 +- templates/show_edit_artist.inc.php | 8 +-- templates/show_edit_artist_row.inc.php | 2 +- templates/show_edit_catalog.inc.php | 36 ++++++------- templates/show_edit_live_stream_row.inc.php | 12 ++--- templates/show_edit_playlist_row.inc.php | 6 +-- templates/show_edit_playlist_song_row.inc.php | 2 +- templates/show_edit_playlist_title.inc.php | 6 +-- templates/show_edit_shout.inc.php | 10 ++-- templates/show_edit_smartplaylist_row.inc.php | 6 +-- templates/show_edit_smartplaylist_title.inc.php | 6 +-- templates/show_edit_song.inc.php | 24 ++++----- templates/show_edit_song_row.inc.php | 2 +- templates/show_edit_user.inc.php | 46 ++++++++--------- templates/show_export.inc.php | 10 ++-- templates/show_flag_row.inc.php | 4 +- templates/show_flagged.inc.php | 26 +++++----- templates/show_gather_art.inc.php | 8 +-- templates/show_get_albumart.inc.php | 12 ++--- templates/show_import_playlist.inc.php | 8 +-- templates/show_index.inc.php | 2 +- templates/show_install.inc.php | 30 +++++------ templates/show_install_account.inc.php | 18 +++---- templates/show_install_check.inc.php | 60 +++++++++++----------- templates/show_install_config.inc.php | 32 ++++++------ templates/show_install_lang.inc.php | 6 +-- templates/show_ip_history.inc.php | 14 +++--- templates/show_live_stream.inc.php | 4 +- templates/show_live_stream_row.inc.php | 6 +-- templates/show_live_streams.inc.php | 26 +++++----- templates/show_localplay_add_instance.inc.php | 4 +- templates/show_localplay_control.inc.php | 10 ++-- templates/show_localplay_controllers.inc.php | 22 ++++---- templates/show_localplay_edit_instance.inc.php | 4 +- templates/show_localplay_instances.inc.php | 8 +-- templates/show_localplay_playlist.inc.php | 16 +++--- templates/show_localplay_status.inc.php | 18 +++---- templates/show_login_form.inc.php | 16 +++--- templates/show_lostpassword_form.inc.php | 8 +-- templates/show_lyrics.inc.php | 4 +- templates/show_lyrics_song.inc.php | 6 +-- templates/show_mail_users.inc.php | 42 ++++++++-------- templates/show_manage_catalogs.inc.php | 20 ++++---- templates/show_manage_democratic.inc.php | 24 ++++----- templates/show_manage_shoutbox.inc.php | 26 +++++----- templates/show_newest.inc.php | 2 +- templates/show_now_playing.inc.php | 2 +- templates/show_now_playing_row.inc.php | 16 +++--- templates/show_object_rating.inc.php | 6 +-- templates/show_object_rating_static.inc.php | 8 +-- templates/show_objects.inc.php | 2 +- templates/show_playlist.inc.php | 22 ++++---- templates/show_playlist_row.inc.php | 10 ++-- templates/show_playlist_song_row.inc.php | 8 +-- templates/show_playlist_songs.inc.php | 36 ++++++------- templates/show_playlist_title.inc.php | 2 +- templates/show_playlists.inc.php | 22 ++++---- templates/show_playtype_switch.inc.php | 8 +-- templates/show_plugins.inc.php | 26 +++++----- templates/show_popular.inc.php | 2 +- templates/show_preference_admin.inc.php | 20 ++++---- templates/show_preference_box.inc.php | 30 +++++------ templates/show_preferences.inc.php | 4 +- templates/show_random.inc.php | 22 ++++---- templates/show_random_albums.inc.php | 6 +-- templates/show_recently_played.inc.php | 32 ++++++------ templates/show_recommended_artists.inc.php | 36 ++++++------- templates/show_registration_confirmation.inc.php | 8 +-- templates/show_rename_artist.inc.php | 10 ++-- templates/show_rules.inc.php | 10 ++-- templates/show_run_add_catalog.inc.php | 4 +- templates/show_search.inc.php | 18 +++---- templates/show_search_bar.inc.php | 14 +++--- templates/show_search_options.inc.php | 10 ++-- templates/show_shout_row.inc.php | 4 +- templates/show_shoutbox.inc.php | 4 +- templates/show_smartplaylist.inc.php | 16 +++--- templates/show_smartplaylist_row.inc.php | 8 +-- templates/show_smartplaylist_title.inc.php | 2 +- templates/show_smartplaylists.inc.php | 18 +++---- templates/show_song.inc.php | 16 +++--- templates/show_song_row.inc.php | 12 ++--- templates/show_songs.inc.php | 38 +++++++------- templates/show_stats.inc.php | 38 +++++++------- templates/show_stats_popular.inc.php | 4 +- templates/show_tagcloud.inc.php | 2 +- templates/show_test.inc.php | 64 ++++++++++++------------ templates/show_test_config.inc.php | 2 +- templates/show_update_items.inc.php | 6 +-- templates/show_user.inc.php | 18 +++---- templates/show_user_activate.inc.php | 12 ++--- templates/show_user_preferences.inc.php | 10 ++-- templates/show_user_recommendations.inc.php | 12 ++--- templates/show_user_registration.inc.php | 26 +++++----- templates/show_user_row.inc.php | 10 ++-- templates/show_user_stats.inc.php | 12 ++--- templates/show_users.inc.php | 32 ++++++------ templates/show_verify_catalog.inc.php | 8 +-- templates/show_video_row.inc.php | 4 +- templates/show_videos.inc.php | 30 +++++------ templates/sidebar.inc.php | 12 ++--- templates/sidebar_admin.inc.php | 32 ++++++------ templates/sidebar_home.inc.php | 56 ++++++++++----------- templates/sidebar_localplay.inc.php | 20 ++++---- templates/sidebar_modules.inc.php | 20 ++++---- templates/sidebar_preferences.inc.php | 6 +-- 151 files changed, 1277 insertions(+), 1277 deletions(-) (limited to 'templates') diff --git a/templates/browse_filters.inc.php b/templates/browse_filters.inc.php index 7fe310d0..c0117c9f 100644 --- a/templates/browse_filters.inc.php +++ b/templates/browse_filters.inc.php @@ -29,49 +29,49 @@ session_start(); $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); ?> get_type()); ?> -

  • +

  • - +
    -
    +
    id . '&key=min_count&value=1', '')); ?> -
    +
    id . '&key=rated&value=1', '')); ?> get_filter('unplayed') ? 'checked="checked"' : ''; ?>/> -
    +
    get_filter('playlist_type') ? 'checked="checked"' : ''; ?>/> -
    +
    id . '&key=playlist_type&value=1','')); ?> get_filter('object_type'); ${$string} = 'selected="selected"'; ?> /> -
    +
    id . '&type=song','')); ?> -
    +
    id . '&type=album','')); ?> -
    +
    id . '&type=artist','')); ?>
    -
    +
    /> +  /> id, '')); ?>
    diff --git a/templates/error_page.inc.php b/templates/error_page.inc.php index 91c73be5..0ea85359 100644 --- a/templates/error_page.inc.php +++ b/templates/error_page.inc.php @@ -34,7 +34,7 @@ -<?php echo( _("Ampache error page"));?> +<?php echo( T_("Ampache error page"));?> @@ -51,9 +51,9 @@
     
    - +

    - :
    + :
    diff --git a/templates/footer.inc.php b/templates/footer.inc.php index 21e8fe59..f40c2a75 100644 --- a/templates/footer.inc.php +++ b/templates/footer.inc.php @@ -28,14 +28,14 @@ ?>
    - + diff --git a/templates/header.inc.php b/templates/header.inc.php index 8a7fe98f..86c62046 100644 --- a/templates/header.inc.php +++ b/templates/header.inc.php @@ -47,8 +47,8 @@ if(!is_file($cssdir.'default-rtl.css')) { - - + + <?php echo scrub_out(Config::get('site_title')); ?> - <?php echo $location['title']; ?> @@ -73,7 +73,7 @@ if (Config::get('use_rss')) { ?> - fullname; ?> [] + fullname; ?> [] @@ -89,7 +89,7 @@ if (Config::get('use_rss')) { ?>
    has_access(100)) { ?>
    - - + +
    diff --git a/templates/install_header.inc.php b/templates/install_header.inc.php index 9f91b952..57ee13db 100644 --- a/templates/install_header.inc.php +++ b/templates/install_header.inc.php @@ -41,20 +41,20 @@ $prefix = realpath(dirname(__FILE__). "/../");
    -

    +

    - +

      -
      • -
      • +
      • +

    - +

    diff --git a/templates/list_header.inc.php b/templates/list_header.inc.php index 26366a18..ed66bb92 100644 --- a/templates/list_header.inc.php +++ b/templates/list_header.inc.php @@ -106,8 +106,8 @@ if ($pages > 1) { ?>
    - id . '&start=' . $prev_offset,_('Prev'),'browse_' . $uid . 'prev','','prev'); ?> - id . '&start=' . $next_offset,_('Next'),'browse_' . $uid . 'next','','next'); ?> + id . '&start=' . $prev_offset, T_('Prev'),'browse_' . $uid . 'prev','','prev'); ?> + id . '&start=' . $next_offset, T_('Next'),'browse_' . $uid . 'next','','next'); ?> $offset) { diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php index c860b77f..3085a405 100644 --- a/templates/rightbar.inc.php +++ b/templates/rightbar.inc.php @@ -29,13 +29,13 @@ ?>
    • - +
    • - + diff --git a/templates/show_access_list.inc.php b/templates/show_access_list.inc.php index 0e1e687d..1840bd99 100644 --- a/templates/show_access_list.inc.php +++ b/templates/show_access_list.inc.php @@ -32,40 +32,40 @@ */ ?> - +
      • - - + +
      • - - + +
      • - - + +
      • - - + +
      - + - - - - - - - + + + + + + + f_user; ?> diff --git a/templates/show_account.inc.php b/templates/show_account.inc.php index 1b4035f3..781860c5 100644 --- a/templates/show_account.inc.php +++ b/templates/show_account.inc.php @@ -32,32 +32,32 @@
      f_type; ?> - - + +
      - + - + - + - + - + @@ -67,5 +67,5 @@ - + diff --git a/templates/show_add_access.inc.php b/templates/show_add_access.inc.php index 89f01f9a..b458407d 100644 --- a/templates/show_add_access.inc.php +++ b/templates/show_add_access.inc.php @@ -27,65 +27,65 @@ */ ?> - +
      ::
      ::
      ::
      ::
      ::
      - + - + - + - + - + - + - - + - +
      ::
      :: - - - - + + + +
      ::
      ::

      ::

      +

      (255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff)
      :: :: @@ -94,7 +94,7 @@
      - +
      diff --git a/templates/show_add_access_current.inc.php b/templates/show_add_access_current.inc.php index ab86ec84..1f1f18db 100644 --- a/templates/show_add_access_current.inc.php +++ b/templates/show_add_access_current.inc.php @@ -27,39 +27,39 @@ */ ?> - +
      - + - + - + - + - + - + @@ -67,7 +67,7 @@
      ::
      ::
      :: - - - - + + + +
      ::

      ::
      - +
      diff --git a/templates/show_add_access_local.inc.php b/templates/show_add_access_local.inc.php index 81587b1a..ef204483 100644 --- a/templates/show_add_access_local.inc.php +++ b/templates/show_add_access_local.inc.php @@ -27,62 +27,62 @@ */ ?> - +
      - + - + - + - + - + - + - - + - +
      ::
      :: - - - - + + + +
      ::
      :: -
      - + +
      - +
      +
      + + +
      + +

      ::

      +

      (255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff)
      :: :: @@ -91,7 +91,7 @@
      - +
      diff --git a/templates/show_add_access_rpc.inc.php b/templates/show_add_access_rpc.inc.php index e7c2ecd8..ed9d8a8d 100644 --- a/templates/show_add_access_rpc.inc.php +++ b/templates/show_add_access_rpc.inc.php @@ -27,62 +27,62 @@ */ ?> - +
      - + - + - + - + - + - + - - + - +
      ::
      :: - - - - + + + +
      ::
      :: -
      - +
      - + +
      + +
      + +

      ::

      +

      (255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff)
      :: :: @@ -91,7 +91,7 @@
      - +
      diff --git a/templates/show_add_catalog.inc.php b/templates/show_add_catalog.inc.php index 2b352d4b..2bd217b6 100644 --- a/templates/show_add_catalog.inc.php +++ b/templates/show_add_catalog.inc.php @@ -29,70 +29,70 @@ $default_rename = "%a - %T - %t"; $default_sort = "%a/%A"; ?> - -

      + +

      - + - + - + - - + + - - + + - + - + - + - +
      : : - :
      - %A =
      - %a =
      - %c =
      - %T =
      - %t =
      - %y =
      - %o =
      + :
      + %A =
      + %a =
      + %c =
      + %T =
      + %t =
      + %y =
      + %o =
      : :
      : :
      : *: *
      : *: *
      : :
      :
      		:
      ::
      ::
      - +
      diff --git a/templates/show_add_live_stream.inc.php b/templates/show_add_live_stream.inc.php index 60e0fc4c..ec790ca3 100644 --- a/templates/show_add_live_stream.inc.php +++ b/templates/show_add_live_stream.inc.php @@ -27,44 +27,44 @@ */ ?> - +
      - + - + - + - + - + - + @@ -72,7 +72,7 @@
      - +
      diff --git a/templates/show_add_playlist.inc.php b/templates/show_add_playlist.inc.php index a2fc25fa..c510b38e 100644 --- a/templates/show_add_playlist.inc.php +++ b/templates/show_add_playlist.inc.php @@ -27,15 +27,15 @@ */ ?> - +
      - + - +
      ::
      ::
      - +
      diff --git a/templates/show_add_shout.inc.php b/templates/show_add_shout.inc.php index 99d43390..e0eda1a0 100644 --- a/templates/show_add_shout.inc.php +++ b/templates/show_add_shout.inc.php @@ -27,18 +27,18 @@ */ ?> - +
      - - + @@ -46,7 +46,7 @@ - +
      +
      diff --git a/templates/show_add_user.inc.php b/templates/show_add_user.inc.php index e672876e..5e2daa51 100644 --- a/templates/show_add_user.inc.php +++ b/templates/show_add_user.inc.php @@ -27,13 +27,13 @@ */ ?> - + "> - +
      - : + : @@ -41,14 +41,14 @@
      ::
      - : + : @@ -56,7 +56,7 @@
      - : + : @@ -65,7 +65,7 @@
      - : + : @@ -73,23 +73,23 @@
      - : + : access; ${$var_name} = 'selected="selected"'; ?>
      - +
      diff --git a/templates/show_adds_catalog.inc.php b/templates/show_adds_catalog.inc.php index 1da117a2..3cf50cd2 100644 --- a/templates/show_adds_catalog.inc.php +++ b/templates/show_adds_catalog.inc.php @@ -26,11 +26,11 @@ * @link http://www.ampache.org/ */ -show_box_top(_('Starting New Song Search'), 'box box_adds_catalog'); +show_box_top(T_('Starting New Song Search'), 'box box_adds_catalog'); /* HINT: Catalog Name */ -printf(_('Starting New Song Search on %s catalog'), "[ $this->name ]"); +printf(T_('Starting New Song Search on %s catalog'), "[ $this->name ]"); echo "
      \n"; -echo _('Found') . ': ' . _('None') . '
      '; -echo _('Reading') . ':
      '; +echo T_('Found') . ': ' . T_('None') . '
      '; +echo T_('Reading') . ':
      '; show_box_bottom(); ?> diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php index 09e7e505..71d2bd02 100644 --- a/templates/show_admin_info.inc.php +++ b/templates/show_admin_info.inc.php @@ -35,14 +35,14 @@ $flagged = Flag::get_recent(10); $songs = Catalog::get_disabled(10); ?> - + - +  
      - ... + ...
      diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php index 1bff7747..568220b9 100644 --- a/templates/show_admin_tools.inc.php +++ b/templates/show_admin_tools.inc.php @@ -30,15 +30,15 @@ $web_path = Config::get('web_path'); $catalogs = Catalog::get_catalogs(); ?> - + - - + + @@ -49,22 +49,22 @@ $catalogs = Catalog::get_catalogs(); @@ -72,34 +72,34 @@ $catalogs = Catalog::get_catalogs(); - - + +
      -  |  +  |  -  |  +  |  -  |  +  |  -  |  +  |  - +
      - +
      - - - -
      - - - + + + +
      + + +
      - +
      - - - - - - - + + + + + + +
      diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php index c91cbf09..82f5a32e 100644 --- a/templates/show_album.inc.php +++ b/templates/show_album.inc.php @@ -32,14 +32,14 @@ $ajax_url = Config::get('ajax_url'); // Title for this album $title = scrub_out($album->name) . ' (' . $album->year . ')'; if ($album->disk) { - $title .= "disk . "\">, " . _('Disk') . " " . $album->disk . ""; + $title .= "disk . "\">, " . T_('Disk') . " " . $album->disk . ""; } $title .= ' - ' . $album->f_artist_link; ?>
      name != _('Unknown (Orphaned)')) { + if ($album->name != T_('Unknown (Orphaned)')) { $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); $aa_url = $web_path . "/image.php?id=" . $album->id . "&type=popup&sid=" . session_id(); @@ -53,36 +53,36 @@ $title .= ' - ' . $album->f_artist_link;
      id,'album'); ?>
      -

      :

      +

      :

      • - id,'add',_('Add'),'play_full_' . $album->id); ?> - id,_('Add Album'), 'play_full_text_' . $album->id); ?> + id,'add', T_('Add'),'play_full_' . $album->id); ?> + id, T_('Add Album'), 'play_full_text_' . $album->id); ?>
      • - id,'random',_('Random'),'play_random_' . $album->id); ?> - id,_('Add Random from Album'), 'play_random_text_' . $album->id); ?> + id,'random', T_('Random'),'play_random_' . $album->id); ?> + id, T_('Add Random from Album'), 'play_random_text_' . $album->id); ?>
      • - - + +
      • - - + +
      • - - + +
      • - - + +
      diff --git a/templates/show_album_art.inc.php b/templates/show_album_art.inc.php index f6e05283..5d968961 100644 --- a/templates/show_album_art.inc.php +++ b/templates/show_album_art.inc.php @@ -31,7 +31,7 @@ $total_images = count($images); $rows = floor($total_images/4); $i = 0; ?> - + - + - + - id,'edit',_('Edit'),'edit_album_' . $album->id); ?> + id,'edit', T_('Edit'),'edit_album_' . $album->id); ?> diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php index cafa4c4e..d0d4d0f2 100644 --- a/templates/show_albums.inc.php +++ b/templates/show_albums.inc.php @@ -45,17 +45,17 @@ $ajax_url = Config::get('ajax_url'); - + - + - - - - - - - + + + + + + + - + - + - + - - - - - - - + + + + + + +
      - <?php echo _('Album Art'); ?> + <?php echo T_('Album Art'); ?>

      [x] - + - [] + []

      		- id,'add',_('Add'),'add_album_' . $album->id); ?> - id,'random',_('Random'),'random_album_' . $album->id); ?> + id,'add', T_('Add'),'add_album_' . $album->id); ?> + id,'random', T_('Random'),'random_album_' . $album->id); ?>
      id . '&sort=name',_('Album'),'album_sort_name'); ?>id . '&sort=artist',_('Artist'),'album_sort_artist'); ?>id . '&sort=year',_('Year'),'album_sort_year'); ?>id . '&sort=name', T_('Album'),'album_sort_name'); ?>id . '&sort=artist', T_('Artist'),'album_sort_artist'); ?>id . '&sort=year', T_('Year'),'album_sort_year'); ?>
      id . '&sort=name',_('Album'),'album_sort_name_bottom'); ?>id . '&sort=year',_('Year'),'album_sort_year_bottom'); ?>id . '&sort=name', T_('Album'),'album_sort_name_bottom'); ?>id . '&sort=year', T_('Year'),'album_sort_year_bottom'); ?>
      diff --git a/templates/show_all_popular.inc.php b/templates/show_all_popular.inc.php index 447d31c2..fd139c93 100644 --- a/templates/show_all_popular.inc.php +++ b/templates/show_all_popular.inc.php @@ -30,25 +30,25 @@ diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php index 2c1d9fab..60090c29 100644 --- a/templates/show_artist.inc.php +++ b/templates/show_artist.inc.php @@ -39,43 +39,43 @@ if (Config::get('ratings')) {
      -

      :

      +

      :

      • - - f_name); ?> + + f_name); ?> - - f_name); ?> + + f_name); ?>
      • - id,'add',_('Add'),'add_' . $artist->id); ?> - id,sprintf(_('Add All Songs By %s'), $artist->f_name),'add_text_' . $artist->id); ?> + id,'add', T_('Add'),'add_' . $artist->id); ?> + id,sprintf(T_('Add All Songs By %s'), $artist->f_name),'add_text_' . $artist->id); ?>
      • - id,'random',_('Random'),'random_' . $artist->id); ?> - id, sprintf(_('Add Random Songs By %s'), $artist->f_name),'random_text_' . $artist->id); ?> + id,'random', T_('Random'),'random_' . $artist->id); ?> + id, sprintf(T_('Add Random Songs By %s'), $artist->f_name),'random_text_' . $artist->id); ?>
      • - - + +
      • - - + +
      • - /> + /> id,'')); ?>
      diff --git a/templates/show_artist_row.inc.php b/templates/show_artist_row.inc.php index f5902168..91bf28b2 100644 --- a/templates/show_artist_row.inc.php +++ b/templates/show_artist_row.inc.php @@ -28,8 +28,8 @@ ?> @@ -40,10 +40,10 @@ diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php index 2d7b2d02..eba96932 100644 --- a/templates/show_artists.inc.php +++ b/templates/show_artists.inc.php @@ -43,14 +43,14 @@ $web_path = Config::get('web_path'); - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + +
      - + - + - +
       
      - + - + - +
       
      - id,'add',_('Add'),'add_artist_' . $artist->id); ?> - id,'random',_('Random'),'random_artist_' . $artist->id); ?> + id,'add', T_('Add'),'add_artist_' . $artist->id); ?> + id,'random', T_('Random'),'random_artist_' . $artist->id); ?> f_name_link; ?> songs; ?> - + - id,'edit',_('Edit'),'edit_artist_' . $artist->id); ?> + id,'edit', T_('Edit'),'edit_artist_' . $artist->id); ?>
      diff --git a/templates/show_big_art.inc.php b/templates/show_big_art.inc.php index d537f072..1efdb14b 100644 --- a/templates/show_big_art.inc.php +++ b/templates/show_big_art.inc.php @@ -33,11 +33,11 @@ $htmllang = str_replace("_","-",Config::get('lang')); -<?php echo Config::get('site_title'); ?> - <?php echo _("Album Art"); ?> +<?php echo Config::get('site_title'); ?> - <?php echo T_("Album Art"); ?> "; +echo ""; echo "\"\""; echo ""; ?> diff --git a/templates/show_catalog_row.inc.php b/templates/show_catalog_row.inc.php index 0f0ee5cf..b4e70e85 100644 --- a/templates/show_catalog_row.inc.php +++ b/templates/show_catalog_row.inc.php @@ -34,10 +34,10 @@ $web_path = Config::get('web_path'); f_add); ?> f_clean); ?> - - | - | - | - | - | + + | + | + | + | + | diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php index 5c274da4..4939c488 100644 --- a/templates/show_catalogs.inc.php +++ b/templates/show_catalogs.inc.php @@ -38,12 +38,12 @@ - - - - - - + + + + + + "> - + - - - - - - + + + + + + diff --git a/templates/show_clean_catalog.inc.php b/templates/show_clean_catalog.inc.php index 23eab269..ad73cd8b 100644 --- a/templates/show_clean_catalog.inc.php +++ b/templates/show_clean_catalog.inc.php @@ -28,9 +28,9 @@ show_box_top(); /* HINT: Catalog Name */ -printf(_('Cleaning the %s Catalog'), "[ $this->name ]"); +printf(T_('Cleaning the %s Catalog'), "[ $this->name ]"); echo "...
      "; -echo _('Checking') . ':
      '; -echo _('Reading') . ':
      '; +echo T_('Checking') . ':
      '; +echo T_('Reading') . ':
      '; show_box_bottom(); ?> diff --git a/templates/show_confirmation.inc.php b/templates/show_confirmation.inc.php index 0f46556e..74b4044d 100644 --- a/templates/show_confirmation.inc.php +++ b/templates/show_confirmation.inc.php @@ -32,12 +32,12 @@ $confirmation = Core::form_register($form_name);
      - +
      - +
      diff --git a/templates/show_create_democratic.inc.php b/templates/show_create_democratic.inc.php index 757954f5..f84f6ba0 100644 --- a/templates/show_create_democratic.inc.php +++ b/templates/show_create_democratic.inc.php @@ -26,45 +26,45 @@ * @link http://www.ampache.org/ */ -show_box_top(_('Configure Democratic Playlist')); ?> +show_box_top(T_('Configure Democratic Playlist')); ?>
      - + - + - - + + - +
      base_playlist); ?>
      - +
      diff --git a/templates/show_debug.inc.php b/templates/show_debug.inc.php index 3722f2d4..8a3dbfa1 100644 --- a/templates/show_debug.inc.php +++ b/templates/show_debug.inc.php @@ -27,44 +27,44 @@ */ ?> - +
      • - - + +
      • - - + +
      - + - - + + - + - + - - + + - + @@ -72,33 +72,33 @@ - + - + - + - +
      - + - - + + $value) { if ($key == 'database_password' || $key == 'mysql_password') { $value = '*********'; } diff --git a/templates/show_democratic.inc.php b/templates/show_democratic.inc.php index 0bac3584..3430c042 100644 --- a/templates/show_democratic.inc.php +++ b/templates/show_democratic.inc.php @@ -27,29 +27,29 @@ */ /* HINT: Democratic Name */ -$string = $democratic->is_enabled() ? sprintf(_('%s Playlist') ,$democratic->name) : _('Democratic Playlist'); +$string = $democratic->is_enabled() ? sprintf(T_('%s Playlist') ,$democratic->name) : T_('Democratic Playlist'); show_box_top($string , 'info-box'); ?>
        is_enabled()) { ?>
      • - :f_cooldown; ?> + :f_cooldown; ?>
      • - - + +
        • is_enabled()) { ?>
      • - id),'all',_('Play'),'play_democratic'); ?> - + id),'all', T_('Play'),'play_democratic'); ?> +
      • - id),'delete',_('Clear Playlist'),'clear_democratic'); ?> - + id),'delete', T_('Clear Playlist'),'clear_democratic'); ?> +
        • diff --git a/templates/show_democratic_playlist.inc.php b/templates/show_democratic_playlist.inc.php index 10f21f91..b1b01cf9 100644 --- a/templates/show_democratic_playlist.inc.php +++ b/templates/show_democratic_playlist.inc.php @@ -47,7 +47,7 @@ if (!count($object_ids)) { ?>
      - - - - - - + + + + + + - + $data) { @@ -91,7 +91,7 @@ foreach($object_ids as $row_id=>$data) { @@ -99,14 +99,14 @@ foreach($object_ids as $row_id=>$data) { } // end foreach ?> - - - - - - + + + + + + - +

      -

      -

      - +

      +

      + - +

      diff --git a/templates/show_disabled_songs.inc.php b/templates/show_disabled_songs.inc.php index e914d657..ff60333b 100644 --- a/templates/show_disabled_songs.inc.php +++ b/templates/show_disabled_songs.inc.php @@ -39,12 +39,12 @@
      - - - - - - + + + + + + @@ -58,20 +58,20 @@ - + - - - - - - + + + + + +
      - : + : name); ?> @@ -59,14 +59,14 @@ if (!count($object_ids)) { else { ?>
      has_vote($media->id)) { ?> - + - id . '&type=' . scrub_out($data['object_type']),'tick',_('Add Vote'),'remove_vote_' . $row_id); ?> + id . '&type=' . scrub_out($data['object_type']),'tick', T_('Add Vote'),'remove_vote_' . $row_id); ?> get_vote($row_id)); ?>f_time; ?> - +
      -    +   
      diff --git a/templates/show_duplicate.inc.php b/templates/show_duplicate.inc.php index 6e35cff1..5999e9e2 100644 --- a/templates/show_duplicate.inc.php +++ b/templates/show_duplicate.inc.php @@ -27,26 +27,26 @@ */ ?> - +
      - +
      :: - />
      - />
      - />
      + />
      + />
      + />
      - />
      + />
      - +
      diff --git a/templates/show_duplicates.inc.php b/templates/show_duplicates.inc.php index 0eccaa85..d5305c97 100644 --- a/templates/show_duplicates.inc.php +++ b/templates/show_duplicates.inc.php @@ -27,7 +27,7 @@ */ ?> - +
      @@ -41,14 +41,14 @@ - - - - - - - - + + + + + + + + @@ -80,14 +80,14 @@ } // end foreach ($flags as $flag) ?> - - - - - - - - + + + + + + + +
      - + f_link; ?> f_artist_link; ?>
      diff --git a/templates/show_dynamic.inc.php b/templates/show_dynamic.inc.php index ead83af9..89f52ac9 100644 --- a/templates/show_dynamic.inc.php +++ b/templates/show_dynamic.inc.php @@ -27,7 +27,7 @@ */ ?> - + @@ -36,10 +36,10 @@ - - - - + + + + diff --git a/templates/show_edit_access.inc.php b/templates/show_edit_access.inc.php index 767eede5..28bd0f73 100644 --- a/templates/show_edit_access.inc.php +++ b/templates/show_edit_access.inc.php @@ -27,69 +27,69 @@ */ ?> - +
      @@ -61,7 +61,7 @@ - + @@ -69,20 +69,20 @@
      - + - + - +
      - + - + - - + - + - + - + - +
      : :
      : :

      +

      (255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff)
      :: ::
      :: user); ?>
      :: level; ${$name} = 'checked="checked"'; ?> - > - > - > - > + > + > + > + >
      - +
      diff --git a/templates/show_edit_album.inc.php b/templates/show_edit_album.inc.php index 4b082efd..2830eaf7 100644 --- a/templates/show_edit_album.inc.php +++ b/templates/show_edit_album.inc.php @@ -28,17 +28,17 @@ ?> - +
      - + - + @@ -46,13 +46,13 @@
        - +
      - +
      diff --git a/templates/show_edit_album_row.inc.php b/templates/show_edit_album_row.inc.php index 95030ebe..5b04a9a6 100644 --- a/templates/show_edit_album_row.inc.php +++ b/templates/show_edit_album_row.inc.php @@ -40,7 +40,7 @@ show_artist_select('artist',$album->artist_id); } else { - echo _('Various'); + echo T_('Various'); } ?> @@ -53,7 +53,7 @@ - id . '&type=album_row','download',_('Save Changes'),'save_album_' . $album->id,'edit_album_' . $album->id); ?> + id . '&type=album_row','download', T_('Save Changes'),'save_album_' . $album->id,'edit_album_' . $album->id); ?> diff --git a/templates/show_edit_artist.inc.php b/templates/show_edit_artist.inc.php index 93801e5e..d5d265e4 100644 --- a/templates/show_edit_artist.inc.php +++ b/templates/show_edit_artist.inc.php @@ -28,11 +28,11 @@ ?> - +
      - + @@ -40,13 +40,13 @@
        - +
      - +
      diff --git a/templates/show_edit_artist_row.inc.php b/templates/show_edit_artist_row.inc.php index 2b837949..8779e10d 100644 --- a/templates/show_edit_artist_row.inc.php +++ b/templates/show_edit_artist_row.inc.php @@ -37,7 +37,7 @@ - id . '&type=artist_row','download',_('Save Changes'),'save_artist_' . $artist->id,'edit_artist_' . $artist->id); ?> + id . '&type=artist_row','download', T_('Save Changes'),'save_artist_' . $artist->id,'edit_artist_' . $artist->id); ?> diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php index a23ebb2c..02041978 100644 --- a/templates/show_edit_catalog.inc.php +++ b/templates/show_edit_catalog.inc.php @@ -27,44 +27,44 @@ */ ?> -name . ' (' . $catalog->path . ')'), 'box box_edit_catalog'); ?> +name . ' (' . $catalog->path . ')'), 'box box_edit_catalog'); ?>
      - + - + - - + + - - + + - +
      :: - :
      - %A =
      - %a =
      - %c =
      - %T =
      - %t =
      - %y =
      - %o =
      + :
      + %A =
      + %a =
      + %c =
      + %T =
      + %t =
      + %y =
      + %o =
      catalog_type)); ?>
      : *: *
      : *: *
      ::
      - :
      + :
      		 @@ -74,7 +74,7 @@
      - +
      diff --git a/templates/show_edit_live_stream_row.inc.php b/templates/show_edit_live_stream_row.inc.php index 64fe252f..dd1a06b8 100644 --- a/templates/show_edit_live_stream_row.inc.php +++ b/templates/show_edit_live_stream_row.inc.php @@ -31,11 +31,11 @@
      - - - - - + + + + + @@ -57,7 +57,7 @@
       
      - id . '&type=live_stream_row','download',_('Save Changes'),'save_live_stream_' . $radio->id,'edit_live_stream_' . $radio->id); ?> + id . '&type=live_stream_row','download', T_('Save Changes'),'save_live_stream_' . $radio->id,'edit_live_stream_' . $radio->id); ?>
      diff --git a/templates/show_edit_playlist_row.inc.php b/templates/show_edit_playlist_row.inc.php index 5b853a75..19abb1f5 100644 --- a/templates/show_edit_playlist_row.inc.php +++ b/templates/show_edit_playlist_row.inc.php @@ -37,13 +37,13 @@
      		type; ${$name} = ' selected="selected"'; ?> - id . '&type=playlist_row','download',_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + id . '&type=playlist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?>
      diff --git a/templates/show_edit_playlist_song_row.inc.php b/templates/show_edit_playlist_song_row.inc.php index 7efc8086..84bab2aa 100644 --- a/templates/show_edit_playlist_song_row.inc.php +++ b/templates/show_edit_playlist_song_row.inc.php @@ -43,7 +43,7 @@ - id . '&track_id=' . $track['id'],'download',_('Save Changes'),'save_track_' . $track['id'],'edit_track_' . $track['id']); ?> + id . '&track_id=' . $track['id'],'download', T_('Save Changes'),'save_track_' . $track['id'],'edit_track_' . $track['id']); ?> diff --git a/templates/show_edit_playlist_title.inc.php b/templates/show_edit_playlist_title.inc.php index dac65ed9..20743262 100644 --- a/templates/show_edit_playlist_title.inc.php +++ b/templates/show_edit_playlist_title.inc.php @@ -36,13 +36,13 @@ type; ${$name} = ' selected="selected"'; ?> - id . '&type=playlist_title','download',_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + id . '&type=playlist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> diff --git a/templates/show_edit_shout.inc.php b/templates/show_edit_shout.inc.php index 6e407623..13ff1cfb 100644 --- a/templates/show_edit_shout.inc.php +++ b/templates/show_edit_shout.inc.php @@ -27,25 +27,25 @@ */ ?> - + - - - +
      f_link, $object->f_link); ?> + f_link, $object->f_link); ?>
      +
      sticky == "1") { echo "checked"; } ?>/> sticky == "1") { echo "checked"; } ?>/>
      - +
      diff --git a/templates/show_edit_smartplaylist_row.inc.php b/templates/show_edit_smartplaylist_row.inc.php index fadd1bc7..f02fc62a 100644 --- a/templates/show_edit_smartplaylist_row.inc.php +++ b/templates/show_edit_smartplaylist_row.inc.php @@ -30,13 +30,13 @@ type; ${$name} = ' selected="selected"'; ?> - id . '&type=smartplaylist_row','download',_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + id . '&type=smartplaylist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> diff --git a/templates/show_edit_smartplaylist_title.inc.php b/templates/show_edit_smartplaylist_title.inc.php index e6451e66..25730ef9 100644 --- a/templates/show_edit_smartplaylist_title.inc.php +++ b/templates/show_edit_smartplaylist_title.inc.php @@ -29,13 +29,13 @@ type; ${$name} = ' selected="selected"'; ?> - id . '&type=smartplaylist_title','download',_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + id . '&type=smartplaylist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> diff --git a/templates/show_edit_song.inc.php b/templates/show_edit_song.inc.php index 09627569..40f3758f 100644 --- a/templates/show_edit_song.inc.php +++ b/templates/show_edit_song.inc.php @@ -28,49 +28,49 @@ ?> - + - + - + - + - + - + - + - + @@ -78,14 +78,14 @@
      :: file); ?>
      album); ?> -

      +

      artist); ?> -

      +

        - +
      - +
      diff --git a/templates/show_edit_song_row.inc.php b/templates/show_edit_song_row.inc.php index 9ddc78a7..9224dfd4 100644 --- a/templates/show_edit_song_row.inc.php +++ b/templates/show_edit_song_row.inc.php @@ -50,7 +50,7 @@ - id . '&type=song_row','download',_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?> + id . '&type=song_row','download', T_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?> diff --git a/templates/show_edit_user.inc.php b/templates/show_edit_user.inc.php index 1ff58f06..844ed2b1 100644 --- a/templates/show_edit_user.inc.php +++ b/templates/show_edit_user.inc.php @@ -27,16 +27,16 @@ */ ?> - +
      "> - + - + - + - + - + - + @@ -119,7 +119,7 @@
      - : + : @@ -44,14 +44,14 @@
      ::
      - : + : @@ -59,7 +59,7 @@
      - : + : @@ -68,7 +68,7 @@
      - : + : @@ -76,42 +76,42 @@
      - : + : access; ${$var_name} = 'selected="selected"'; ?>
      - +
      - +
      diff --git a/templates/show_export.inc.php b/templates/show_export.inc.php index 2ba58b4f..8595253c 100644 --- a/templates/show_export.inc.php +++ b/templates/show_export.inc.php @@ -31,14 +31,14 @@ ${$name} = ' selected="selected"'; $name = 'catalog_' . $_REQUEST['export_catalog']; ${$name} = ' selected="selected"'; -show_box_top(_('Export Catalog'), 'box box_export'); ?> +show_box_top(T_('Export Catalog'), 'box box_export'); ?> - + - +
      ::
      ::
      - +
      diff --git a/templates/show_flag_row.inc.php b/templates/show_flag_row.inc.php index 3c599d64..a94b2717 100644 --- a/templates/show_flag_row.inc.php +++ b/templates/show_flag_row.inc.php @@ -35,9 +35,9 @@ print_status(); ?> approved) { ?> - id,'disable',_('Reject'),'reject_flag_' . $flag->id); ?> + id,'disable', T_('Reject'),'reject_flag_' . $flag->id); ?> - id,'enable',_('Enable'),'enable_flag_' . $flag->id); ?> + id,'enable', T_('Enable'),'enable_flag_' . $flag->id); ?> diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php index cec20187..2f5e9639 100644 --- a/templates/show_flagged.inc.php +++ b/templates/show_flagged.inc.php @@ -38,12 +38,12 @@ $web_path = Config::get('web_path'); - - - - - - + + + + + + - + - - - - - - + + + + + + diff --git a/templates/show_gather_art.inc.php b/templates/show_gather_art.inc.php index 424b1792..24b10254 100644 --- a/templates/show_gather_art.inc.php +++ b/templates/show_gather_art.inc.php @@ -26,9 +26,9 @@ * @link http://www.ampache.org/ */ -show_box_top(_('Album Art Search'), 'box box_gather_art'); -echo "" . _('Starting Album Art Search') . ". . .
      \n"; -echo _('Searched') . ": " . _('None') . "
      "; -echo _('Reading') . ":
      "; +show_box_top(T_('Album Art Search'), 'box box_gather_art'); +echo "" . T_('Starting Album Art Search') . ". . .
      \n"; +echo T_('Searched') . ": " . T_('None') . "
      "; +echo T_('Reading') . ":
      "; show_box_bottom(); ?> diff --git a/templates/show_get_albumart.inc.php b/templates/show_get_albumart.inc.php index 46954fb7..d064cce5 100644 --- a/templates/show_get_albumart.inc.php +++ b/templates/show_get_albumart.inc.php @@ -27,12 +27,12 @@ */ ?> - +
      @@ -36,9 +36,9 @@ diff --git a/templates/show_live_streams.inc.php b/templates/show_live_streams.inc.php index 02983486..87a73b35 100644 --- a/templates/show_live_streams.inc.php +++ b/templates/show_live_streams.inc.php @@ -40,12 +40,12 @@ $web_path = Config::get('web_path'); - - - - - - + + + + + + - + - - - - - - + + + + + +
      -   +   @@ -40,7 +40,7 @@
      -   +   @@ -48,7 +48,7 @@
      - + @@ -56,7 +56,7 @@
      - + @@ -67,7 +67,7 @@ - + diff --git a/templates/show_import_playlist.inc.php b/templates/show_import_playlist.inc.php index bb5bd7c6..f1bcbe5f 100644 --- a/templates/show_import_playlist.inc.php +++ b/templates/show_import_playlist.inc.php @@ -27,18 +27,18 @@ */ ?> - +
      - : + :
      - +
      - +
      diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php index 17927f7d..b6588d76 100644 --- a/templates/show_index.inc.php +++ b/templates/show_index.inc.php @@ -36,7 +36,7 @@ if (Art::is_enabled()) { echo Ajax::observe('window','load',Ajax::action('?page=index&action=random_albums','random_albums')); ?>
      - +
      diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php index 598be729..195da699 100644 --- a/templates/show_install.inc.php +++ b/templates/show_install.inc.php @@ -30,57 +30,57 @@ $prefix = realpath(dirname(__FILE__). "/../"); require $prefix . '/templates/install_header.inc.php'; ?>
      -
      +
      -
      +
      -
      -
      +
      +


      - +
      " enctype="multipart/form-data" > - + - + - + - + - + - + - + - + - + - +
      ? ?
       " />" />
      diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php index fb0b4f7c..a2f16de6 100644 --- a/templates/show_install_account.inc.php +++ b/templates/show_install_account.inc.php @@ -30,32 +30,32 @@ $prefix = realpath(dirname(__FILE__). "/../"); require $prefix . '/templates/install_header.inc.php'; ?>
      -
      -
      -
      +
      +
      +
      -
      +

      - +
      " enctype="multipart/form-data" > - + - + - + - +
       
      diff --git a/templates/show_install_check.inc.php b/templates/show_install_check.inc.php index 95334f57..f405aa55 100644 --- a/templates/show_install_check.inc.php +++ b/templates/show_install_check.inc.php @@ -28,15 +28,15 @@ ?> -

      +

      - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -63,8 +63,8 @@ - - + +
      ::
      ::
      ::
      ::
      ::

      ::
      ::
      ::
      ::
      ::
      -
      -
      +
      +
      -
      +
      -
      +

      - +
      " enctype="multipart/form-data" > - + - + - + - + - + @@ -77,7 +77,7 @@ require $prefix . '/templates/install_header.inc.php';
        - - /> + + />
      - +
      [
      - + [   - [] + []

      " enctype="multipart/form-data"> - +
      diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php index 81395ebb..506bdee8 100644 --- a/templates/show_install_lang.inc.php +++ b/templates/show_install_lang.inc.php @@ -32,12 +32,12 @@ require $prefix . '/templates/install_header.inc.php';
      - +
      - +

      @@ -58,7 +58,7 @@ foreach ($languages as $lang=>$name) { echo "\n"; ?> - +
      diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php index 5f71aad7..4ac9c1e3 100644 --- a/templates/show_ip_history.inc.php +++ b/templates/show_ip_history.inc.php @@ -27,16 +27,16 @@ */ ?> -fullname)); ?> +fullname)); ?>
      • - + - +
      @@ -49,8 +49,8 @@
      diff --git a/templates/show_live_stream.inc.php b/templates/show_live_stream.inc.php index b119108c..0717d832 100644 --- a/templates/show_live_stream.inc.php +++ b/templates/show_live_stream.inc.php @@ -27,11 +27,11 @@ */ ?> - +
      • - +
      diff --git a/templates/show_live_stream_row.inc.php b/templates/show_live_stream_row.inc.php index 8b039824..75917b48 100644 --- a/templates/show_live_stream_row.inc.php +++ b/templates/show_live_stream_row.inc.php @@ -28,7 +28,7 @@ ?>
      		- id,'add',_('Add'),'add_radio_' . $radio->id); ?> + id,'add', T_('Add'),'add_radio_' . $radio->id); ?> f_name_link; ?> f_callsign; ?>f_tag; ?> - id,'edit',_('Edit'),'edit_radio_' . $radio->id); ?> + id,'edit', T_('Edit'),'edit_radio_' . $radio->id); ?> - id,'delete',_('Delete'),'delete_radio_' . $radio->id); ?> + id,'delete', T_('Delete'),'delete_radio_' . $radio->id); ?>
      diff --git a/templates/show_localplay_add_instance.inc.php b/templates/show_localplay_add_instance.inc.php index 0863ddb5..5ae40d59 100644 --- a/templates/show_localplay_add_instance.inc.php +++ b/templates/show_localplay_add_instance.inc.php @@ -27,7 +27,7 @@ */ ?> - +
      $field) { ?> @@ -38,7 +38,7 @@
      - +
      diff --git a/templates/show_localplay_control.inc.php b/templates/show_localplay_control.inc.php index 2a4a7aa4..7eaaf4cb 100644 --- a/templates/show_localplay_control.inc.php +++ b/templates/show_localplay_control.inc.php @@ -28,9 +28,9 @@ ?>
      - - - - - + + + + +
      diff --git a/templates/show_localplay_controllers.inc.php b/templates/show_localplay_controllers.inc.php index 8b3cda94..c6494266 100644 --- a/templates/show_localplay_controllers.inc.php +++ b/templates/show_localplay_controllers.inc.php @@ -37,10 +37,10 @@ $web_path = Config::get('web_path'); - - - - + + + + format(); if (Localplay::is_enabled($controller)) { $action = 'confirm_uninstall_localplay'; - $action_txt = _('Disable'); + $action_txt = T_('Disable'); } else { $action = 'install_localplay'; - $action_txt = _('Activate'); + $action_txt = T_('Activate'); } ?> @@ -64,14 +64,14 @@ foreach ($controllers as $controller) { - + - - - - + + + +
      diff --git a/templates/show_localplay_edit_instance.inc.php b/templates/show_localplay_edit_instance.inc.php index 42a5dcf8..ca9ca250 100644 --- a/templates/show_localplay_edit_instance.inc.php +++ b/templates/show_localplay_edit_instance.inc.php @@ -27,7 +27,7 @@ */ ?> - +
      $field) { ?> @@ -38,7 +38,7 @@
      - +
      diff --git a/templates/show_localplay_instances.inc.php b/templates/show_localplay_instances.inc.php index c88934cc..5d61cd45 100644 --- a/templates/show_localplay_instances.inc.php +++ b/templates/show_localplay_instances.inc.php @@ -27,13 +27,13 @@ */ ?> - + $field) { ?> - + $name) { $instance = $localplay->get_instance($uid); @@ -43,8 +43,8 @@ diff --git a/templates/show_localplay_playlist.inc.php b/templates/show_localplay_playlist.inc.php index ea42800c..7572cf95 100644 --- a/templates/show_localplay_playlist.inc.php +++ b/templates/show_localplay_playlist.inc.php @@ -38,9 +38,9 @@ $status = $localplay->status(); - - - + + + format_name($object['name'],$object['id']); ?> - + - - - + + +
      - - + +
      - +
      diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php index 028e442d..b97b6b79 100644 --- a/templates/show_localplay_status.inc.php +++ b/templates/show_localplay_status.inc.php @@ -30,28 +30,28 @@ $status = $localplay->status(); $now_playing = $status['track_title'] ? $status['track_title'] . ' - ' . $status['track_album'] . ' - ' . $status['track_artist'] : ''; ?> -type), 'box box_localplay_status'); ?> -: +type), 'box box_localplay_status'); ?> +:
      • - - - -:% + + + +:%
      • | - +
      • | - +
      • - +
      diff --git a/templates/show_login_form.inc.php b/templates/show_login_form.inc.php index d4d65b2d..58860351 100644 --- a/templates/show_login_form.inc.php +++ b/templates/show_login_form.inc.php @@ -63,28 +63,28 @@ function focus(){ document.login.username.focus(); }
      - +
      - +
      /> +   />
      - - + + - +
      @@ -96,7 +96,7 @@ if (@is_readable(Config::get('prefix') . '/config/motd.php')) { ?>
      @@ -105,7 +105,7 @@ if (@is_readable(Config::get('prefix') . '/config/motd.php')) { diff --git a/templates/show_lostpassword_form.inc.php b/templates/show_lostpassword_form.inc.php index c8a782dc..07a8cce7 100644 --- a/templates/show_lostpassword_form.inc.php +++ b/templates/show_lostpassword_form.inc.php @@ -70,16 +70,16 @@ function focus(){ document.login.username.focus(); }

      -
      +
      + value="" />
      diff --git a/templates/show_lyrics.inc.php b/templates/show_lyrics.inc.php index aa5eb34c..89b4978d 100644 --- a/templates/show_lyrics.inc.php +++ b/templates/show_lyrics.inc.php @@ -37,14 +37,14 @@ * @todo get lyrics from id3tag, if possible. */ /* HINT: Song Title */ -show_box_top(sprintf(_('%s Lyrics'), $song->title), 'box box_lyrics'); +show_box_top(sprintf(T_('%s Lyrics'), $song->title), 'box box_lyrics'); ?> diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php index 35adadc8..a9961b26 100644 --- a/templates/show_playlist.inc.php +++ b/templates/show_playlist.inc.php @@ -43,33 +43,33 @@ show_box_top('
      ' . $title .
      • - - + +
      • - - + +
      • - id,'add',_('Add All'),'play_playlist'); ?> - + id,'add', T_('Add All'),'play_playlist'); ?> +
      • - id,'random',_('Add Random'),'play_playlist_random'); ?> - + id,'random', T_('Add Random'),'play_playlist_random'); ?> +
        • has_access()) { ?>
      • - id,'edit',_('Edit'),'edit_playlist_' . $playlist->id); ?> - + id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> +
      • - +
      diff --git a/templates/show_playlist_row.inc.php b/templates/show_playlist_row.inc.php index 95e252f5..08f83e84 100644 --- a/templates/show_playlist_row.inc.php +++ b/templates/show_playlist_row.inc.php @@ -28,8 +28,8 @@ ?>
      @@ -38,11 +38,11 @@ diff --git a/templates/show_playlist_song_row.inc.php b/templates/show_playlist_song_row.inc.php index 22ff8ee2..eae9cc54 100644 --- a/templates/show_playlist_song_row.inc.php +++ b/templates/show_playlist_song_row.inc.php @@ -27,7 +27,7 @@ */ ?> - + @@ -41,11 +41,11 @@ diff --git a/templates/show_playlist_songs.inc.php b/templates/show_playlist_songs.inc.php index c3ebc3b6..a9f997d2 100644 --- a/templates/show_playlist_songs.inc.php +++ b/templates/show_playlist_songs.inc.php @@ -46,19 +46,19 @@ $ajax_url = Config::get('ajax_url'); - - - - - - - + + + + + + + - + - + - - - - - - - + + + + + + + - + - +
      f_artist_full));
      - +
      - +
      - + diff --git a/templates/show_mail_users.inc.php b/templates/show_mail_users.inc.php index acc13fb5..66cd7ad2 100644 --- a/templates/show_mail_users.inc.php +++ b/templates/show_mail_users.inc.php @@ -28,17 +28,17 @@ ?> - +
      - + @@ -47,43 +47,43 @@ - - - - - - + + + + + + - + - - - - - - + + + + + +
      ::
      - + - + - + - + - + - + - + - + @@ -91,7 +91,7 @@ - + @@ -102,23 +102,23 @@ --> - + - + - + @@ -126,7 +126,7 @@
      :: ::
      :: ::
      :: ::
      :: ::
      ::
      ::
      ::
      ::
      - +
      diff --git a/templates/show_manage_catalogs.inc.php b/templates/show_manage_catalogs.inc.php index 4656b1d5..7f5d302a 100644 --- a/templates/show_manage_catalogs.inc.php +++ b/templates/show_manage_catalogs.inc.php @@ -27,27 +27,27 @@ */ ?> - +
      diff --git a/templates/show_manage_democratic.inc.php b/templates/show_manage_democratic.inc.php index 33d5373a..9b274265 100644 --- a/templates/show_manage_democratic.inc.php +++ b/templates/show_manage_democratic.inc.php @@ -26,7 +26,7 @@ * @link http://www.ampache.org/ */ -show_box_top(_('Manage Democratic Playlists')); ?> +show_box_top(T_('Manage Democratic Playlists')); ?>
        -
        • -
        • -
        • -
        • -
        • -
        • +
        • +
        • +
        • +
        • +
        • +
      - /data/myNewMusic'); ?>
      + /data/myNewMusic'); ?>

      - /data/myUpdatedMusic'); ?>
      + /data/myUpdatedMusic'); ?>

      - +
      @@ -38,13 +38,13 @@ show_box_top(_('Manage Democratic Playlists')); ?> - - - - - - - + + + + + + + - +
      f_primary; ?> count_items(); ?> - id,'all',_('Play'),'play_democratic'); ?> - + id,'all', T_('Play'),'play_democratic'); ?> +

      - +
      diff --git a/templates/show_manage_shoutbox.inc.php b/templates/show_manage_shoutbox.inc.php index b6b1fe0b..374c5a24 100644 --- a/templates/show_manage_shoutbox.inc.php +++ b/templates/show_manage_shoutbox.inc.php @@ -38,12 +38,12 @@ $web_path = Config::get('web_path');
      diff --git a/templates/show_newest.inc.php b/templates/show_newest.inc.php index 6236058a..23740c88 100644 --- a/templates/show_newest.inc.php +++ b/templates/show_newest.inc.php @@ -27,6 +27,6 @@ */ ?> - + diff --git a/templates/show_now_playing.inc.php b/templates/show_now_playing.inc.php index b2e8140f..09374b63 100644 --- a/templates/show_now_playing.inc.php +++ b/templates/show_now_playing.inc.php @@ -36,7 +36,7 @@ if (count($results)) { $link = Config::get('use_rss') ? ' ' . AmpacheRSS::get_display('nowplaying') : ''; ?> - + f_artist_full)); ?>
      - + fullname); ?>
      - +
      id,'song'); ?>
      @@ -50,7 +50,7 @@ $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full));
      - +
      @@ -58,21 +58,21 @@ $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full));
      - +
      - +
      - + @@ -93,7 +93,7 @@ $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full));
      artist, 3, false)) { ?>
      - +
      f_artist_full)); id, 3)) { ?>
      - +
      type . '&object_id=' . if ($width < 0) $width = 0; //set the current rating background - echo "
    • " . _('Current rating: '); + echo "
    • " . T_('Current rating: '); if ($rating->rating <= 0) { - echo _('not rated yet') . "
      • \n"; + echo T_('not rated yet') . "\n"; } - else printf(_('%s of 5'), $rating->preciserating); echo "\n"; + else printf(T_('%s of 5'), $rating->preciserating); echo "\n"; for ($i=1; $i<6; $i++) { diff --git a/templates/show_object_rating_static.inc.php b/templates/show_object_rating_static.inc.php index 285d3bb3..198bb3b3 100644 --- a/templates/show_object_rating_static.inc.php +++ b/templates/show_object_rating_static.inc.php @@ -39,17 +39,17 @@ $base_url = Config::get('ajax_url') . '?action=set_rating&rating_type=' . $r if ($width < 0) $width = 0; //set the current rating background - echo "
    • " . _('Current rating: '); + echo "
    • " . T_('Current rating: '); if ($rating->rating <= 0) { - echo _('not rated yet') . "
      • \n"; + echo T_('not rated yet') . "\n"; } - else printf(_('%s of 5') ,$rating->preciserating); echo "\n"; + else printf(T_('%s of 5') ,$rating->preciserating); echo "\n"; for ($i=1; $i<6; $i++) { ?>
    • - +
      • - +
      - id,'add',_('Add'),'add_playlist_' . $playlist->id); ?> - id,'random',_('Random'),'random_playlist_' . $playlist->id); ?> + id,'add', T_('Add'),'add_playlist_' . $playlist->id); ?> + id,'random', T_('Random'),'random_playlist_' . $playlist->id); ?> f_link; ?> f_type; ?> - + has_access()) { ?> - id,'edit',_('Edit'),'edit_playlist_' . $playlist->id); ?> - id,'delete',_('Delete'),'delete_playlist_' . $playlist->id); ?> + id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> + id,'delete', T_('Delete'),'delete_playlist_' . $playlist->id); ?> id,'add',_('Add'),'playlist_add_' . $song->id); ?>id,'add', T_('Add'),'playlist_add_' . $song->id); ?> f_link; ?> f_artist_link; ?> - + has_access()) { ?> - id . '&track_id=' . $object['track_id'],'edit',_('Edit'),'track_edit_' . $object['track_id']); ?> - id . '&track_id=' . $object['track_id'],'delete',_('Delete'),'track_del_' . $object['track_id']); ?> + id . '&track_id=' . $object['track_id'],'edit', T_('Edit'),'track_edit_' . $object['track_id']); ?> + id . '&track_id=' . $object['track_id'],'delete', T_('Delete'),'track_del_' . $object['track_id']); ?>
       
       
      diff --git a/templates/show_playlist_title.inc.php b/templates/show_playlist_title.inc.php index 957f0e64..cc3cee0b 100644 --- a/templates/show_playlist_title.inc.php +++ b/templates/show_playlist_title.inc.php @@ -28,4 +28,4 @@ ?> -f_type, $playlist->name); ?> +f_type, $playlist->name); ?> diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php index c3959629..46999725 100644 --- a/templates/show_playlists.inc.php +++ b/templates/show_playlists.inc.php @@ -38,12 +38,12 @@ - - + +   - - - + + + - + - - + +   - - - + + + diff --git a/templates/show_playtype_switch.inc.php b/templates/show_playtype_switch.inc.php index 095a8b17..0a085d96 100644 --- a/templates/show_playtype_switch.inc.php +++ b/templates/show_playtype_switch.inc.php @@ -37,13 +37,13 @@ if (Preference::has_access('play_type')) {
      diff --git a/templates/show_plugins.inc.php b/templates/show_plugins.inc.php index dd434d0c..ead57dfd 100644 --- a/templates/show_plugins.inc.php +++ b/templates/show_plugins.inc.php @@ -37,11 +37,11 @@ $web_path = Config::get('web_path'); - - - - - + + + + + _plugin->name); if (! $installed_version) { $action = "" . - _('Activate') . ""; + T_('Activate') . ""; } else { $action = "" . - _('Deactivate') . ""; + T_('Deactivate') . ""; if ($installed_version < $plugin->_plugin->version) { $action .= '  ' . _('Upgrade') . ''; + scrub_out($plugin_name) . '">' . T_('Upgrade') . ''; } } ?> @@ -70,14 +70,14 @@ foreach ($plugins as $plugin_name) { - + - - - - + + + +
      diff --git a/templates/show_popular.inc.php b/templates/show_popular.inc.php index c3bfeb52..db6cd424 100644 --- a/templates/show_popular.inc.php +++ b/templates/show_popular.inc.php @@ -27,7 +27,7 @@ */ ?> - + - +
      @@ -35,32 +35,32 @@ - - + + - + - - + +
      - +
      diff --git a/templates/show_preference_box.inc.php b/templates/show_preference_box.inc.php index cd7b753c..6a8803a6 100644 --- a/templates/show_preference_box.inc.php +++ b/templates/show_preference_box.inc.php @@ -33,7 +33,7 @@ if ((Access::check('interface','100') OR !Config::get('use_auth')) AND $_REQUEST $is_admin = true; } ?> -

      +

      @@ -44,16 +44,16 @@ if ((Access::check('interface','100') OR !Config::get('use_auth')) AND $_REQUEST - - + + - - + + - + @@ -62,11 +62,11 @@ if ((Access::check('interface','100') OR !Config::get('use_auth')) AND $_REQUEST @@ -74,11 +74,11 @@ if ((Access::check('interface','100') OR !Config::get('use_auth')) AND $_REQUEST - - + + - - + +
      diff --git a/templates/show_preferences.inc.php b/templates/show_preferences.inc.php index 9aa98244..5ad845f5 100644 --- a/templates/show_preferences.inc.php +++ b/templates/show_preferences.inc.php @@ -32,13 +32,13 @@ */ ?> - +
      - + diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php index c2ab692e..dcd0bd76 100644 --- a/templates/show_random.inc.php +++ b/templates/show_random.inc.php @@ -27,19 +27,19 @@ */ ?> - + - - - + + +
       
      - + - + - + @@ -40,23 +40,23 @@ diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php index 4befb999..98331fc6 100644 --- a/templates/show_songs.inc.php +++ b/templates/show_songs.inc.php @@ -43,19 +43,19 @@ $ajax_url = Config::get('ajax_url'); - - - - - - - + + + + + + + - + - + - + - - - - - - - + + + + + + + - + - +
      >100 - +
      + diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php index be669f75..e5abaa23 100644 --- a/templates/show_random_albums.inc.php +++ b/templates/show_random_albums.inc.php @@ -27,9 +27,9 @@ */ $web_path = Config::get('web_path'); -$button = Ajax::button('?page=index&action=random_albums','random',_('Refresh'),'random_refresh'); +$button = Ajax::button('?page=index&action=random_albums','random', T_('Refresh'),'random_refresh'); ?> - + "; } ?> - id,'add',_('Play Album'),'play_full_' . $album->id); ?> + id,'add', T_('Play Album'),'play_full_' . $album->id); ?> diff --git a/templates/show_recently_played.inc.php b/templates/show_recently_played.inc.php index f91f71de..542dd2b2 100644 --- a/templates/show_recently_played.inc.php +++ b/templates/show_recently_played.inc.php @@ -27,7 +27,7 @@ */ $link = Config::get('use_rss') ? ' ' . AmpacheRSS::get_display('recently_played') : ''; -show_box_top(_('Recently Played') . $link, 'box box_recently_played'); +show_box_top(T_('Recently Played') . $link, 'box box_recently_played'); ?> @@ -39,12 +39,12 @@ show_box_top(_('Recently Played') . $link, 'box box_recently_played'); - - - - - - + + + + + + format(); ?> @@ -105,16 +105,16 @@ show_box_top(_('Recently Played') . $link, 'box box_recently_played'); - + - - - - - - + + + + + +
      - id,'add',_('Add'),'add_' . $song->id); ?> + id,'add', T_('Add'),'add_' . $song->id); ?> f_link; ?> f_album_link; ?>
      diff --git a/templates/show_recommended_artists.inc.php b/templates/show_recommended_artists.inc.php index 6a168048..4652a0eb 100644 --- a/templates/show_recommended_artists.inc.php +++ b/templates/show_recommended_artists.inc.php @@ -27,7 +27,7 @@ */ ?> - + @@ -39,14 +39,14 @@ - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + +
      diff --git a/templates/show_registration_confirmation.inc.php b/templates/show_registration_confirmation.inc.php index 9aad6786..d7b62222 100644 --- a/templates/show_registration_confirmation.inc.php +++ b/templates/show_registration_confirmation.inc.php @@ -33,22 +33,22 @@ $web_path = Config::get('web_path'); -<?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?> +<?php echo Config::get('site_title'); ?> - <?php echo T_('Registration'); ?>
      - +

      - +

      Ampache
      diff --git a/templates/show_rename_artist.inc.php b/templates/show_rename_artist.inc.php index 604ffcc8..8eebe5ce 100644 --- a/templates/show_rename_artist.inc.php +++ b/templates/show_rename_artist.inc.php @@ -33,15 +33,15 @@ function insert() document.getElementById('artist_name').value = 'name; ?>'; } -name)); ?> +name)); ?>

      id, "artist_id", 4); ?>
      -
      +
      - []
      + []
      print_error('artist_name'); ?> -  
      -
      +  
      +
      diff --git a/templates/show_rules.inc.php b/templates/show_rules.inc.php index e588f23a..ed076f0e 100644 --- a/templates/show_rules.inc.php +++ b/templates/show_rules.inc.php @@ -32,15 +32,15 @@ $logic_operator = strtolower($logic_operator); - + - + @@ -48,7 +48,7 @@ $logic_operator = strtolower($logic_operator); diff --git a/templates/show_run_add_catalog.inc.php b/templates/show_run_add_catalog.inc.php index be9f5b6f..d25ec832 100644 --- a/templates/show_run_add_catalog.inc.php +++ b/templates/show_run_add_catalog.inc.php @@ -28,5 +28,5 @@ // Get the count of the number of items in their playlist ?> -:
      -:
      +:
      +:
      diff --git a/templates/show_search.inc.php b/templates/show_search.inc.php index e55ba308..0d5484db 100644 --- a/templates/show_search.inc.php +++ b/templates/show_search.inc.php @@ -31,23 +31,23 @@ * This is the template for the searches... amazing! */ ?> - +
      - +
      - - - - + + + +
       
      - + diff --git a/templates/show_shoutbox.inc.php b/templates/show_shoutbox.inc.php index 5455539b..d2fc403e 100644 --- a/templates/show_shoutbox.inc.php +++ b/templates/show_shoutbox.inc.php @@ -27,7 +27,7 @@ */ ?> - +
      get_image(); ?> - object_type .'&id=' . $shout->object_id,'add',_('Add'),'add_' . $shout->object_type . '_' . $shout->object_id); ?> + object_type .'&id=' . $shout->object_id,'add', T_('Add'),'add_' . $shout->object_type . '_' . $shout->object_id); ?> f_link; ?> f_link; ?> date); ?> text); ?> diff --git a/templates/show_smartplaylist.inc.php b/templates/show_smartplaylist.inc.php index adde43fa..917c0a35 100644 --- a/templates/show_smartplaylist.inc.php +++ b/templates/show_smartplaylist.inc.php @@ -31,24 +31,24 @@ show_box_top('
      ' . $title .
      • - - + +
      • - id,'add',_('Add All'),'play_playlist'); ?> - + id,'add', T_('Add All'),'play_playlist'); ?> +
        • has_access()) { ?>
      • - id,'edit',_('Edit'),'edit_playlist_' . $playlist->id); ?> - + id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> +
      • - +
      @@ -59,7 +59,7 @@ show_box_top('
      ' . $title .
      - +
      diff --git a/templates/show_smartplaylist_row.inc.php b/templates/show_smartplaylist_row.inc.php index bf1f43f0..201df5cb 100644 --- a/templates/show_smartplaylist_row.inc.php +++ b/templates/show_smartplaylist_row.inc.php @@ -21,7 +21,7 @@ */ ?>
      @@ -29,11 +29,11 @@ diff --git a/templates/show_smartplaylist_title.inc.php b/templates/show_smartplaylist_title.inc.php index 8691ac98..1d81ca80 100644 --- a/templates/show_smartplaylist_title.inc.php +++ b/templates/show_smartplaylist_title.inc.php @@ -21,4 +21,4 @@ */ ?> -f_type, $playlist->name); ?> +f_type, $playlist->name); ?> diff --git a/templates/show_smartplaylists.inc.php b/templates/show_smartplaylists.inc.php index 2c891884..b371d882 100644 --- a/templates/show_smartplaylists.inc.php +++ b/templates/show_smartplaylists.inc.php @@ -32,11 +32,11 @@ - - + + - - + + - + - - + + - - + +
         +    -    +    diff --git a/templates/show_search_bar.inc.php b/templates/show_search_bar.inc.php index 558868bd..fa9dee8e 100644 --- a/templates/show_search_bar.inc.php +++ b/templates/show_search_bar.inc.php @@ -34,14 +34,14 @@ - - + + diff --git a/templates/show_search_options.inc.php b/templates/show_search_options.inc.php index c4e49de6..a9434071 100644 --- a/templates/show_search_options.inc.php +++ b/templates/show_search_options.inc.php @@ -26,17 +26,17 @@ * @link http://www.ampache.org/ */ ?> - +
      • - id,'add',_('Add Search Results'),'add_search_results'); ?> - + id,'add', T_('Add Search Results'),'add_search_results'); ?> +
      • - - + +
      diff --git a/templates/show_shout_row.inc.php b/templates/show_shout_row.inc.php index 154171dd..221f3e89 100644 --- a/templates/show_shout_row.inc.php +++ b/templates/show_shout_row.inc.php @@ -36,11 +36,11 @@
      		- + - +
      - id,'add',_('Add'),'add_playlist_' . $playlist->id); ?> + id,'add', T_('Add'),'add_playlist_' . $playlist->id); ?> f_link; ?> f_type; ?> - + has_access()) { ?> - id,'edit',_('Edit'),'edit_playlist_' . $playlist->id); ?> - id,'delete',_('Delete'),'delete_playlist_' . $playlist->id); ?> + id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> + id,'delete', T_('Delete'),'delete_playlist_' . $playlist->id); ?>
       
       
      diff --git a/templates/show_song.inc.php b/templates/show_song.inc.php index f3cfd638..794ceb43 100644 --- a/templates/show_song.inc.php +++ b/templates/show_song.inc.php @@ -29,22 +29,22 @@ $icon = $song->enabled ? 'disable' : 'enable'; $button_flip_state_id = 'button_flip_state_' . $song->id; ?> -title . ' ' . _('Details'), 'box box_song_details'); ?> +title . ' ' . T_('Details'), 'box box_song_details'); ?>
      -
      +
      id,'song'); ?>
      -
      +
      - id,'add',_('Add'),'add_song_' . $song->id); ?> + id,'add', T_('Add'),'add_song_' . $song->id); ?> - - + + - id,$icon,_(ucfirst($icon)),'flip_song_' . $song->id); ?> + id,$icon, T_(ucfirst($icon)),'flip_song_' . $song->id); ?>
      @@ -72,7 +72,7 @@ $button_flip_state_id = 'button_flip_state_' . $song->id; if(trim($value)) { $rowparity = flip_class(); - echo "
      " . _($key) . "
      " . $value . "
      "; + echo "
      " . T_($key) . "
      " . $value . "
      "; } } ?> diff --git a/templates/show_song_row.inc.php b/templates/show_song_row.inc.php index 626f5967..5913e64a 100644 --- a/templates/show_song_row.inc.php +++ b/templates/show_song_row.inc.php @@ -28,7 +28,7 @@ ?>
      		- id,'add',_('Add'),'add_' . $song->id); ?> + id,'add', T_('Add'),'add_' . $song->id); ?> f_title; ?> f_artist_link; ?>id,'song'); ?> - + - + - + - id,'edit',_('Edit'),'edit_song_' . $song->id); ?> + id,'edit', T_('Edit'),'edit_song_' . $song->id); ?> enabled ? 'disable' : 'enable'; ?> - id,$icon,_(ucfirst($icon)),'flip_song_' . $song->id); ?> + id,$icon, T_(ucfirst($icon)),'flip_song_' . $song->id); ?>
      id . '&sort=title', _('Song Title'), 'sort_song_title'); ?>id . '&sort=artist', _('Artist'), 'sort_song_artist'); ?>id . '&sort=album', _('Album'), 'sort_song_album'); ?>id . '&sort=track', _('Track'), 'sort_song_track'); ?>id . '&sort=time', _('Time'), 'sort_song_time'); ?>id . '&sort=title', T_('Song Title'), 'sort_song_title'); ?>id . '&sort=artist', T_('Artist'), 'sort_song_artist'); ?>id . '&sort=album', T_('Album'), 'sort_song_album'); ?>id . '&sort=track', T_('Track'), 'sort_song_track'); ?>id . '&sort=time', T_('Time'), 'sort_song_time'); ?>
      diff --git a/templates/show_stats.inc.php b/templates/show_stats.inc.php index 07f6da6f..8f3b37e3 100644 --- a/templates/show_stats.inc.php +++ b/templates/show_stats.inc.php @@ -29,19 +29,19 @@ $stats = Catalog::get_stats(); $catalogs = Catalog::get_catalogs(); ?> - - + + - - - - - - - - - + + + + + + + + + @@ -68,14 +68,14 @@ $catalogs = Catalog::get_catalogs(); - - - - - - - - + + + + + + + + _('Most Popular Albums')); + $headers = array('f_link' => T_('Most Popular Albums')); show_box_top('','info-box box_popular_albums'); require Config::get('prefix') . '/templates/show_objects.inc.php'; show_box_bottom(); $objects = Stats::get_top('artist'); - $headers = array('f_name_link'=>_('Most Popular Artists')); + $headers = array('f_name_link' => T_('Most Popular Artists')); show_box_top('','info-box box_popular_artists'); require Config::get('prefix') . '/templates/show_objects.inc.php'; show_box_bottom(); diff --git a/templates/show_tagcloud.inc.php b/templates/show_tagcloud.inc.php index 6ba7bb8f..215b0141 100644 --- a/templates/show_tagcloud.inc.php +++ b/templates/show_tagcloud.inc.php @@ -37,6 +37,6 @@ $web_path = Config::get('web_path'); id),'click',Ajax::action('?page=tag&action=add_filter&browse_id=' . $browse2->id . '&tag_id=' . intval($tag->id),'')); ?> - + diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php index fcc070bd..eda139d8 100644 --- a/templates/show_test.inc.php +++ b/templates/show_test.inc.php @@ -36,26 +36,26 @@
      - + - + - + - + - + - + - + - + - + - + - + - + - + - +
      - +
      [ " . phpversion() . " " . _('Hash Function Exists') . " " . print_bool(function_exists('hash_algos')) . " " . _('SHA256 Support') . " " . print_bool(in_array('sha256',$algos)) . ""; + $string = "" . phpversion() . " " . T_('Hash Function Exists') . " " . print_bool(function_exists('hash_algos')) . " " . T_('SHA256 Support') . " " . print_bool(in_array('sha256',$algos)) . ""; } else { echo debug_result('',true); @@ -64,12 +64,12 @@ ] - +
      [ - +
      [ - +
      [ ] - +
      [ ] - +
      [ ] - +
      [ ] - +
      [ ] - +
      [ -
      - + [ - +
      [ - +
      [ - +
      [ - +
      diff --git a/templates/show_test_config.inc.php b/templates/show_test_config.inc.php index 5a493bff..b78c0dff 100644 --- a/templates/show_test_config.inc.php +++ b/templates/show_test_config.inc.php @@ -44,7 +44,7 @@ body {
      diff --git a/templates/show_update_items.inc.php b/templates/show_update_items.inc.php index c952dc41..0466f876 100644 --- a/templates/show_update_items.inc.php +++ b/templates/show_update_items.inc.php @@ -26,10 +26,10 @@ * @link http://www.ampache.org/ */ -show_box_top(_('Starting Update from Tags'), 'box box_update_items'); +show_box_top(T_('Starting Update from Tags'), 'box box_update_items'); Catalog::update_single_item($type,$object_id); ?>
      -   - +   + diff --git a/templates/show_user.inc.php b/templates/show_user.inc.php index cc085055..653cfd32 100644 --- a/templates/show_user.inc.php +++ b/templates/show_user.inc.php @@ -26,27 +26,27 @@ * @link http://www.ampache.org/ */ -$last_seen = $client->last_seen ? date("m\/d\/y - H:i",$client->last_seen) : _('Never'); -$create_date = $client->create_date ? date("m\/d\/y - H:i",$client->create_date) : _('Unknown'); +$last_seen = $client->last_seen ? date("m\/d\/y - H:i",$client->last_seen) : T_('Never'); +$create_date = $client->create_date ? date("m\/d\/y - H:i",$client->create_date) : T_('Unknown'); $client->format(); ?> fullname); ?> @@ -37,6 +37,6 @@ diff --git a/templates/show_videos.inc.php b/templates/show_videos.inc.php index a4fe0741..90a2b700 100644 --- a/templates/show_videos.inc.php +++ b/templates/show_videos.inc.php @@ -41,13 +41,13 @@ $web_path = Config::get('web_path'); - - - - - - - + + + + + + + - + - - - - - - - + + + + + + +
      - : fullname; ?>
      - :
      - :
      - : f_useage; ?>
      + : fullname; ?>
      + :
      + :
      + : f_useage; ?>
      is_logged_in() AND $client->is_online()) { ?> - + - +       		-

      +

      id)); diff --git a/templates/show_user_activate.inc.php b/templates/show_user_activate.inc.php index af8caf19..71307724 100644 --- a/templates/show_user_activate.inc.php +++ b/templates/show_user_activate.inc.php @@ -33,14 +33,14 @@ $web_path = Config::get('web_path'); -<?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?> +<?php echo Config::get('site_title'); ?> - <?php echo T_('Registration'); ?> @@ -52,15 +52,15 @@ $web_path = Config::get('web_path'); if ($validation == User::get_validation($username) AND strlen($validation)) { User::activate_user($username); ?> -

      +

      ', ''); ?> + printf(T_('This User ID is activated and can be used %sLogin%s'), '', ''); ?>

      -

      -

      +

      +

      diff --git a/templates/show_user_preferences.inc.php b/templates/show_user_preferences.inc.php index ead20fee..f179f768 100644 --- a/templates/show_user_preferences.inc.php +++ b/templates/show_user_preferences.inc.php @@ -32,7 +32,7 @@ */ ?> -fullname),'box box_preferences'); ?> +fullname),'box box_preferences'); ?>
      @@ -40,12 +40,12 @@ - - + + - + @@ -54,7 +54,7 @@ @@ -45,10 +45,10 @@ format_recommendations($recommended_albums,'album'); - show_info_box(_('Recommended Albums'),'album',$items); + show_info_box(T_('Recommended Albums'),'album',$items); } else { - echo "" . _('Not Enough Data') . ""; + echo "" . T_('Not Enough Data') . ""; } ?> @@ -56,10 +56,10 @@ format_recommendations($recommended_songs,'song'); - show_info_box(_('Recommended Songs'),'song',$items); + show_info_box(T_('Recommended Songs'),'song',$items); } else { - echo "" . _('Not Enough Data') . ""; + echo "" . T_('Not Enough Data') . ""; } ?> diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php index 2d9ce3a8..27f951a6 100644 --- a/templates/show_user_registration.inc.php +++ b/templates/show_user_registration.inc.php @@ -33,7 +33,7 @@ $web_path = Config::get('web_path'); -<?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?> +<?php echo Config::get('site_title'); ?> - <?php echo T_('Registration'); ?> @@ -45,7 +45,7 @@ $web_path = Config::get('web_path');
      -

      +

      - +
      -

      +

      - +
      - +
      - +
      - +
      - +
      - +
      @@ -112,7 +112,7 @@ if (Config::get('user_agreement')) { ?>
      - ' /> + ' />
      @@ -120,7 +120,7 @@ if (Config::get('user_agreement')) { ?> diff --git a/templates/show_user_row.inc.php b/templates/show_user_row.inc.php index 13ec72e7..93f783e4 100644 --- a/templates/show_user_row.inc.php +++ b/templates/show_user_row.inc.php @@ -43,18 +43,18 @@ is_logged_in()) AND ($client->is_online())) { diff --git a/templates/show_user_stats.inc.php b/templates/show_user_stats.inc.php index 9d812672..10ca28f5 100644 --- a/templates/show_user_stats.inc.php +++ b/templates/show_user_stats.inc.php @@ -35,11 +35,11 @@ if (count($favorite_artists)) { $items = $working_user->format_favorites($favorite_artists); $title = '' . - get_user_icon('all', _('Favorite Artists')) . ' ' . _('Favorite Artists'); + get_user_icon('all', T_('Favorite Artists')) . ' ' . T_('Favorite Artists'); show_info_box($title,'artist',$items); } else { - echo "" . _('Not Enough Data') . ""; + echo "" . T_('Not Enough Data') . ""; } ?> @@ -48,11 +48,11 @@ if (count($favorite_albums)) { $items = $working_user->format_favorites($favorite_albums); $title = '' . - get_user_icon('all', _('Favorite Albums')) . ' ' . _('Favorite Albums'); + get_user_icon('all', T_('Favorite Albums')) . ' ' . T_('Favorite Albums'); show_info_box($title,'album',$items); } else { - echo "" . _('Not Enough Data') . ""; + echo "" . T_('Not Enough Data') . ""; } ?> @@ -61,11 +61,11 @@ if (count($favorite_songs)) { $items = $working_user->format_favorites($favorite_songs); $title = '' . - get_user_icon('all', _('Favorite Songs')) . ' ' . _('Favorite Songs'); + get_user_icon('all', T_('Favorite Songs')) . ' ' . T_('Favorite Songs'); show_info_box($title,'your_song',$items); } else { - echo "" . _('Not Enough Data') . ""; + echo "" . T_('Not Enough Data') . ""; } ?> diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php index 552d4b19..ae789f4b 100644 --- a/templates/show_users.inc.php +++ b/templates/show_users.inc.php @@ -43,36 +43,36 @@ $web_path = Config::get('web_path'); - - - - + + + + - + - - + + format(); - $last_seen = $client->last_seen ? date("m\/d\/Y - H:i",$client->last_seen) : _('Never'); - $create_date = $client->create_date ? date("m\/d\/Y - H:i",$client->create_date) : _('Unknown'); + $last_seen = $client->last_seen ? date("m\/d\/Y - H:i",$client->last_seen) : T_('Never'); + $create_date = $client->create_date ? date("m\/d\/Y - H:i",$client->create_date) : T_('Unknown'); ?> - - - - + + + + - + - - + +
      - +
      diff --git a/templates/show_user_recommendations.inc.php b/templates/show_user_recommendations.inc.php index 3d163ae5..6b2e761a 100644 --- a/templates/show_user_recommendations.inc.php +++ b/templates/show_user_recommendations.inc.php @@ -34,10 +34,10 @@ format_recommendations($recommended_artists,'artist'); - show_info_box(_('Recommended Artists'),'artist',$items); + show_info_box(T_('Recommended Artists'),'artist',$items); } else { - echo "" . _('Not Enough Data') . ""; + echo "" . T_('Not Enough Data') . ""; } ?>       		- - + + disabled == '1') { - echo "id\">" . get_user_icon('enable', _('Enable')) . ""; + echo "id\">" . get_user_icon('enable', T_('Enable')) . ""; } else { - echo "id\">" . get_user_icon('disable', _('Disable')) .""; + echo "id\">" . get_user_icon('disable', T_('Disable')) .""; } ?> - +
      ( )( )
      ( )( )
      diff --git a/templates/show_verify_catalog.inc.php b/templates/show_verify_catalog.inc.php index 4786c703..a9004b5e 100644 --- a/templates/show_verify_catalog.inc.php +++ b/templates/show_verify_catalog.inc.php @@ -26,13 +26,13 @@ * @link http://www.ampache.org/ */ -show_box_top(_('Verify Catalog'), 'box box_verify_catalog'); +show_box_top(T_('Verify Catalog'), 'box box_verify_catalog'); /* HINT: Catalog Name */ -printf(_('Updating the %s catalog'), "[ $this->name ]"); +printf(T_('Updating the %s catalog'), "[ $this->name ]"); echo "
      \n"; printf(ngettext('%d item found checking tag information', '%d items found checking tag information', $number), $number); echo "
      \n\n"; -echo _('Verified') . ': ' . $catalog_verify_found . '
      '; -echo _('Reading') . ': ' . $catalog_verify_directory . '
      '; +echo T_('Verified') . ': ' . $catalog_verify_found . '
      '; +echo T_('Reading') . ': ' . $catalog_verify_directory . '
      '; show_box_bottom(); ?> diff --git a/templates/show_video_row.inc.php b/templates/show_video_row.inc.php index 6f0ebd1f..e34c4bff 100644 --- a/templates/show_video_row.inc.php +++ b/templates/show_video_row.inc.php @@ -28,7 +28,7 @@ ?>
      		- id,'add',_('Add'),'add_video_' . $video->id); ?> + id,'add', T_('Add'),'add_video_' . $video->id); ?> f_title; ?> f_codec; ?>f_tags; ?> - +
      diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php index f1d980a0..00685bc4 100644 --- a/templates/sidebar.inc.php +++ b/templates/sidebar.inc.php @@ -31,11 +31,11 @@ $class_name = 'sidebar_' . $_SESSION['state']['sidebar_tab']; ${$class_name} = ' active'; // List of buttons ( id, title, icon, access level) -$sidebar_items[] = array('id'=>'home', 'title'=>_('Home'), 'icon'=>'home', 'access'=>5); -$sidebar_items[] = array('id'=>'localplay', 'title'=>_('Localplay'), 'icon'=>'volumeup', 'access'=>5); -$sidebar_items[] = array('id'=>'preferences', 'title'=>_('Preferences'), 'icon'=>'edit', 'access'=>5); -$sidebar_items[] = array('id'=>'modules','title'=>_('Modules'),'icon'=>'plugin','access'=>100); -$sidebar_items[] = array('id'=>'admin', 'title'=>_('Admin'), 'icon'=>'admin', 'access'=>100); +$sidebar_items[] = array('id'=>'home', 'title' => T_('Home'), 'icon'=>'home', 'access'=>5); +$sidebar_items[] = array('id'=>'localplay', 'title' => T_('Localplay'), 'icon'=>'volumeup', 'access'=>5); +$sidebar_items[] = array('id'=>'preferences', 'title' => T_('Preferences'), 'icon'=>'edit', 'access'=>5); +$sidebar_items[] = array('id'=>'modules','title' => T_('Modules'),'icon'=>'plugin','access'=>100); +$sidebar_items[] = array('id'=>'admin', 'title' => T_('Admin'), 'icon'=>'admin', 'access'=>100); $web_path = Config::get('web_path'); @@ -65,7 +65,7 @@ $ajax_url = Config::get('ajax_url'); ?>
    • - +
    diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php index 789d654d..eda90e7c 100644 --- a/templates/sidebar_admin.inc.php +++ b/templates/sidebar_admin.inc.php @@ -28,44 +28,44 @@ ?>
      -

    • +

      • -
        • -
        • +
        • +
      • -

    • +

      • -
        • -
        • +
        • +
      • -

    • +

      • -
        • -
        • +
        • +
      • -

    • +

      • -
        • -
        • -
        • +
        • +
        • +
        • -
        • +
      • -

    • +

      • -
        • +
      • diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php index 8c7fd25d..186bd7e1 100644 --- a/templates/sidebar_home.inc.php +++ b/templates/sidebar_home.inc.php @@ -29,7 +29,7 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); ?>
        -

      • +

        • -
          • -
          • -
          • -
          • -
          • -
          • -
          • -
          • +
          • +
          • +
          • +
          • +
          • +
          • +
          • +
        • -

      • +

        • -
          • +
          • -
          • +
          • current_instance(); $class = $current_instance ? '' : ' class="active_instance"'; ?> -
          • +
          • -
          • +
        • -

      • +

        • -
          • -
          • -
          • -
          • +
          • +
          • +
          • +
        • -

      • +

        • -
          • -
          • - +
          • +
          • +
        • -

      • +

      diff --git a/templates/sidebar_localplay.inc.php b/templates/sidebar_localplay.inc.php index 7339e2a9..a689e497 100644 --- a/templates/sidebar_localplay.inc.php +++ b/templates/sidebar_localplay.inc.php @@ -37,19 +37,19 @@ $class = $current_instance ? '' : ' class="active_instance"'; ?> -

    • +

      • -
        • -
        • +
        • +
        • -
        • +
      • -

    • +

      • -
      • >
        • +
      • >
        • get_instances(); @@ -65,13 +65,13 @@
      • -

      • +

      • -
      • +
      • -
      • +
      • -
      • +
    diff --git a/templates/sidebar_modules.inc.php b/templates/sidebar_modules.inc.php index 83e64568..7989f030 100644 --- a/templates/sidebar_modules.inc.php +++ b/templates/sidebar_modules.inc.php @@ -29,25 +29,25 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); ?>
      -

    • +

      • -
        • -
        • +
        • +
      • -

    • +

      • -
        • -
        • -
        • -
        • +
        • +
        • +
        • +