Changeset 8406
- Timestamp:
- 07/23/08 05:12:57 (4 months ago)
- Files:
-
- trunk/wp-admin/admin-header.php (modified) (4 diffs)
- trunk/wp-includes/vars.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/wp-admin/admin-header.php
r8395 r8406 76 76 <?php 77 77 if ( ! $is_opera ) { 78 $gears_menu = $is_safari ? __('the Safari menu') : __('your browser Tools menu'); 78 79 ?> 79 80 <div id="gears-info-box" class="info-box" style="display:none;"> … … 91 92 <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> 92 93 <p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p> 93 <p><?php _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser\'s Tools menu, then click the button below.'); ?></p>94 <p><?php echo __('To enable it, make sure this web site is not on the denied list in Gears Settings under').' '.$gears_menu.__(', then click the button below.'); ?></p> 94 95 <p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p> 95 96 <div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button> … … 99 100 <div id="gears-msg3" style="display:none;"> 100 101 <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> 101 <p><?php _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); ?></p>102 <p><?php echo __('Gears is installed and enabled on this computer. You can disable it from').' '.$gears_menu; ?>.</p> 102 103 <p><?php _e('If there are any errors, try disabling Gears, then reload the page and enable it again.'); ?></p> 103 104 <p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Please wait! Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p> … … 105 106 </div> 106 107 </div> 107 108 108 <?php } ?> 109 109 trunk/wp-includes/vars.php
r6554 r8406 35 35 36 36 // Simple browser detection 37 $is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = false;37 $is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = false; 38 38 39 39 if (strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false) { 40 40 $is_lynx = true; 41 } elseif ( strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'webkit') !== false ) { 42 $is_safari = true; 41 43 } elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false) { 42 44 $is_gecko = true;
