Skip to:
Content

BuddyPress.org

Changeset 7099


Ignore:
Timestamp:
05/23/2013 01:17:11 AM (13 years ago)
Author:
johnjamesjacoby
Message:

Revert r7097. Will reopen #4857 and leave detailed feedback asap.

Location:
trunk
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-core/bp-core-admin.php

    r7097 r7099  
    9494     */
    9595    private function includes() {
    96         require( $this->admin_dir . 'bp-core-actions.php'      );
    97         require( $this->admin_dir . 'bp-core-settings.php'     );
    98         require( $this->admin_dir . 'bp-core-functions.php'    );
    99         require( $this->admin_dir . 'bp-core-components.php'   );
    100         require( $this->admin_dir . 'bp-core-slugs.php'        );
    101         require( $this->admin_dir . 'bp-core-translations.php' );
     96        require( $this->admin_dir . 'bp-core-actions.php'    );
     97        require( $this->admin_dir . 'bp-core-settings.php'   );
     98        require( $this->admin_dir . 'bp-core-functions.php'  );
     99        require( $this->admin_dir . 'bp-core-components.php' );
     100        require( $this->admin_dir . 'bp-core-slugs.php'      );
    102101    }
    103102

  • trunk/bp-core/bp-core-functions.php

    r7097 r7099  
    12681268 */
    12691269function bp_core_load_buddypress_textdomain() {
    1270     $locale      = apply_filters( 'buddypress_locale', get_locale() );
    1271     $mofile      = sprintf( 'buddypress-%s.mo', $locale );
    1272     $uploads_dir = wp_upload_dir();
    1273 
    1274     $translation_paths = array(
    1275         WP_LANG_DIR . "/{$mofile}",
    1276         BP_PLUGIN_DIR . "bp-languages/{$mofile}",
    1277         $uploads_dir['basedir'] . "/buddypress/{$mofile}",
    1278     );
    1279 
    1280     foreach ( $translation_paths as $path )
    1281         load_textdomain( 'buddypress', $path );
    1282 }
    1283 add_action( 'bp_core_loaded', 'bp_core_load_buddypress_textdomain' );
     1270    $locale        = apply_filters( 'buddypress_locale', get_locale() );
     1271    $mofile        = sprintf( 'buddypress-%s.mo', $locale );
     1272    $mofile_global = WP_LANG_DIR . '/' . $mofile;
     1273    $mofile_local  = BP_PLUGIN_DIR . 'bp-languages/' . $mofile;
     1274
     1275    if ( file_exists( $mofile_global ) )
     1276        return load_textdomain( 'buddypress', $mofile_global );
     1277    elseif ( file_exists( $mofile_local ) )
     1278        return load_textdomain( 'buddypress', $mofile_local );
     1279    else
     1280        return false;
     1281}
     1282add_action ( 'bp_core_loaded', 'bp_core_load_buddypress_textdomain' );
    12841283
    12851284/**
    … …  
    13621361}
    13631362add_action( 'wp_footer', 'bp_core_print_generation_time' );
    1364 
    1365 /**
    1366  * Find out if there's a newer translation available for this site on translate.wordpress.org
    1367  *
    1368  * @since BuddyPress (1.8)
    1369  */
    1370 function bp_core_check_for_updated_translation() {
    1371     require( buddypress()->plugin_dir  . 'bp-core/admin/bp-core-translations.php' );
    1372 
    1373     $locale = BP_Translate::get_locale();
    1374     if ( 'en_US' === $locale )
    1375         return;
    1376 
    1377     // No point checking if we know there's an updated translation
    1378     if ( bp_is_translation_update_pending() )
    1379         return;
    1380 
    1381     $locale = BP_Translate::get_glotpress_locale();
    1382     if ( ! $locale )
    1383         return;
    1384 
    1385     $url  = 'https://translate.wordpress.org/projects/buddypress/%1$s/%2$s/default/export-translations?format=mo';
    1386     $args = bp_get_translation_version() ? array( 'headers' => 'If-Modified-Since: ' . gmdate( 'D, d M Y H:i:s', bp_get_translation_version() ) . ' GMT' ) : array();
    1387 
    1388     // Check version of translation on translate.wordpress.org
    1389     $response = wp_remote_head( sprintf( $url, buddypress()->glotpress_version, $locale ), $args );
    1390     if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) === 304 || wp_remote_retrieve_response_code( $response ) !== 200 )
    1391         return;
    1392 
    1393     // An updated translation is available
    1394     bp_update_option( '_bp_translation_pending', true );
    1395 }
    1396 add_action( 'bp_translate_update_check', 'bp_core_check_for_updated_translation' );

  • trunk/bp-core/bp-core-options.php

    r7097 r7099  
    6464        // The ID for the current theme package.
    6565        '_bp_theme_package_id'            => 'legacy',
    66 
    67         // Timestamp of the the current translation from translate.wordpress.org
    68         '_bp_translation_version'         => 0,
    69 
    70         // Is there a more recent translation available on translate.wordpress.org?
    71         '_bp_translation_pending'         => false,
    7266
    7367        /** Groups ************************************************************/
    … …  
    543537    return apply_filters( 'bp_get_theme_package_id', bp_get_option( '_bp_theme_package_id', $default ) );
    544538}
    545 
    546 /**
    547  * Get the timestamp of the the current translation from translate.wordpress.org
    548  *
    549  * @param int $default Optional; default value 0.
    550  * @return int Unix timestamp
    551  * @since BuddyPress (1.8)
    552  */
    553 function bp_get_translation_version( $default = 0 ) {
    554     return apply_filters( 'bp_get_translation_version', (int) bp_get_option( '_bp_translation_version', $default ) );
    555 }
    556 
    557 /**
    558  * Does translate.wordpress.org have a more recent translation available on translate.wordpress.org?
    559  *
    560  * @param bool $default Optional; defaults to false.
    561  * @return bool
    562  * @see BP_Translate->check_for_updated_translation()
    563  * @since BuddyPress (1.8)
    564  */
    565 function bp_is_translation_update_pending( $default = false ) {
    566     return apply_filters( 'bp_is_translation_update_pending', (bool) bp_get_option( '_bp_translation_pending', $default ) );
    567 }

  • trunk/bp-languages/buddypress.pot

    r7098 r7099  
    55"Project-Id-Version: BuddyPress \n"
    66"Report-Msgid-Bugs-To: http://wppolyglots.wordpress.com\n"
    7 "POT-Creation-Date: 2013-05-22 23:35:18+00:00\n"
     7"POT-Creation-Date: 2013-05-22 05:35:15+00:00\n"
    88"MIME-Version: 1.0\n"
    99"Content-Type: text/plain; charset=UTF-8\n"
    … …  
    8383#: bp-activity/bp-activity-screens.php:394
    8484#: bp-activity/feeds/bp-activity-personal-feed.php:27
    85 #: bp-core/bp-core-admin.php:410
     85#: bp-core/bp-core-admin.php:409
    8686msgid "Activity"
    8787msgstr ""
    … …  
    12891289
    12901290#: bp-core/admin/bp-core-functions.php:364
    1291 #: bp-core/admin/bp-core-settings.php:258 bp-core/bp-core-admin.php:332
     1291#: bp-core/admin/bp-core-settings.php:258 bp-core/bp-core-admin.php:331
    12921292#: bp-groups/bp-groups-loader.php:302 bp-groups/bp-groups-template.php:1468
    12931293#: bp-settings/bp-settings-loader.php:23 bp-settings/bp-settings-loader.php:73
    … …  
    14221422msgstr ""
    14231423
    1424 #: bp-core/admin/bp-core-translations.php:170
    1425 msgid "BuddyPress Translation"
    1426 msgstr ""
    1427 
    1428 #: bp-core/admin/bp-core-translations.php:171
    1429 msgid "An updated version of the current BuddyPress translation is available. Click “Update Translation”."
    1430 msgstr ""
    1431 
    1432 #: bp-core/admin/bp-core-translations.php:176
    1433 msgid "Update Translation"
    1434 msgstr ""
    1435 
    1436 #: bp-core/admin/bp-core-translations.php:192
    1437 #: bp-core/admin/bp-core-translations.php:227
    1438 msgid "You do not have sufficient permissions to update this site."
    1439 msgstr ""
    1440 
    1441 #: bp-core/admin/bp-core-translations.php:203
    1442 msgid "Update BuddyPress Translation"
    1443 msgstr ""
    1444 
    1445 #: bp-core/admin/bp-core-translations.php:232
    1446 msgid "The update process is starting. This process may take a while on some hosts, so please be patient."
    1447 msgstr ""
    1448 
    1449 #: bp-core/admin/bp-core-translations.php:233
    1450 msgid "Updating BuddyPress Translation"
    1451 msgstr ""
    1452 
    1453 #: bp-core/admin/bp-core-translations.php:241
    1454 msgid "Error: failure updating translation."
    1455 msgstr ""
    1456 
    1457 #: bp-core/admin/bp-core-translations.php:246
    1458 msgid "Translation updated succesfully!"
    1459 msgstr ""
    1460 
    1461 #: bp-core/admin/bp-core-translations.php:269
    1462 msgid "Return to WordPress Updates"
    1463 msgstr ""
    1464 
    1465 #: bp-core/bp-core-admin.php:155 bp-core/bp-core-admin.php:156
    1466 #: bp-core/bp-core-admin.php:164 bp-core/bp-core-admin.php:165
     1424#: bp-core/bp-core-admin.php:154 bp-core/bp-core-admin.php:155
     1425#: bp-core/bp-core-admin.php:163 bp-core/bp-core-admin.php:164
    14671426msgid "Welcome to BuddyPress"
    14681427msgstr ""
    14691428
    1470 #: bp-core/bp-core-admin.php:175 bp-core/bp-core-admin.php:176
    1471 #: bp-core/bp-core-admin.php:196
     1429#: bp-core/bp-core-admin.php:174 bp-core/bp-core-admin.php:175
     1430#: bp-core/bp-core-admin.php:195
    14721431msgid "BuddyPress"
    14731432msgstr ""
    14741433
     1434#: bp-core/bp-core-admin.php:184
     1435msgid "BuddyPress Help"
     1436msgstr ""
     1437
    14751438#: bp-core/bp-core-admin.php:185
    1476 msgid "BuddyPress Help"
    1477 msgstr ""
    1478 
    1479 #: bp-core/bp-core-admin.php:186
    14801439msgid "Help"
    14811440msgstr ""
    14821441
    1483 #: bp-core/bp-core-admin.php:195
     1442#: bp-core/bp-core-admin.php:194
    14841443msgid "BuddyPress Components"
    14851444msgstr ""
    14861445
    1487 #: bp-core/bp-core-admin.php:204 bp-core/bp-core-admin.php:205
     1446#: bp-core/bp-core-admin.php:203 bp-core/bp-core-admin.php:204
    14881447msgid "BuddyPress Pages"
    14891448msgstr ""
    14901449
    1491 #: bp-core/bp-core-admin.php:213 bp-core/bp-core-admin.php:214
     1450#: bp-core/bp-core-admin.php:212 bp-core/bp-core-admin.php:213
    14921451msgid "BuddyPress Settings"
    14931452msgstr ""
    14941453
    1495 #: bp-core/bp-core-admin.php:240
     1454#: bp-core/bp-core-admin.php:239
    14961455msgid "Main Settings"
    14971456msgstr ""
    14981457
    1499 #: bp-core/bp-core-admin.php:243 bp-core/bp-core-admin.php:248
     1458#: bp-core/bp-core-admin.php:242 bp-core/bp-core-admin.php:247
    15001459msgid "Toolbar"
    15011460msgstr ""
    15021461
    1503 #: bp-core/bp-core-admin.php:253
     1462#: bp-core/bp-core-admin.php:252
    15041463msgid "Account Deletion"
    15051464msgstr ""
    15061465
    1507 #: bp-core/bp-core-admin.php:261
     1466#: bp-core/bp-core-admin.php:260
    15081467msgid "Profile Settings"
    15091468msgstr ""
    15101469
    1511 #: bp-core/bp-core-admin.php:264
     1470#: bp-core/bp-core-admin.php:263
    15121471msgid "Avatar Uploads"
    15131472msgstr ""
    15141473
    1515 #: bp-core/bp-core-admin.php:268
     1474#: bp-core/bp-core-admin.php:267
    15161475msgid "Profile Syncing"
    15171476msgstr ""
    15181477
    1519 #: bp-core/bp-core-admin.php:277
     1478#: bp-core/bp-core-admin.php:276
    15201479msgid "Groups Settings"
    15211480msgstr ""
    15221481
    1523 #: bp-core/bp-core-admin.php:280
     1482#: bp-core/bp-core-admin.php:279
    15241483msgid "Group Creation"
    15251484msgstr ""
    15261485
    1527 #: bp-core/bp-core-admin.php:289
     1486#: bp-core/bp-core-admin.php:288
    15281487msgid "Legacy Group Forums"
    15291488msgstr ""
    15301489
    1531 #: bp-core/bp-core-admin.php:292
     1490#: bp-core/bp-core-admin.php:291
    15321491msgid "bbPress Configuration"
    15331492msgstr ""
    15341493
    1535 #: bp-core/bp-core-admin.php:301
     1494#: bp-core/bp-core-admin.php:300
    15361495msgid "Activity Settings"
    15371496msgstr ""
    15381497
    1539 #: bp-core/bp-core-admin.php:304
     1498#: bp-core/bp-core-admin.php:303
    15401499msgid "Blog & Forum Comments"
    15411500msgstr ""
    15421501
    1543 #: bp-core/bp-core-admin.php:309
     1502#: bp-core/bp-core-admin.php:308
    15441503msgid "Akismet"
    15451504msgstr ""
    15461505
    1547 #: bp-core/bp-core-admin.php:333
     1506#: bp-core/bp-core-admin.php:332
    15481507msgid "About"
    15491508msgstr ""
    15501509
    1551 #: bp-core/bp-core-admin.php:384 bp-core/bp-core-admin.php:493
     1510#: bp-core/bp-core-admin.php:383 bp-core/bp-core-admin.php:492
    15521511msgid "Welcome to BuddyPress %s"
    15531512msgstr ""
    15541513
    1555 #: bp-core/bp-core-admin.php:387
     1514#: bp-core/bp-core-admin.php:386
    15561515msgid "BuddyPress %s is our safest, fastest, most flexible version ever."
    15571516msgstr ""
    15581517
    1559 #: bp-core/bp-core-admin.php:389
     1518#: bp-core/bp-core-admin.php:388
    15601519msgid "Thank you for updating! BuddyPress %s is our safest, fastest, most flexible version ever."
    15611520msgstr ""
    15621521
    1563 #: bp-core/bp-core-admin.php:392 bp-core/bp-core-admin.php:495
     1522#: bp-core/bp-core-admin.php:391 bp-core/bp-core-admin.php:494
    15641523msgid "Version %s"
    15651524msgstr ""
    15661525
    1567 #: bp-core/bp-core-admin.php:396 bp-core/bp-core-admin.php:499
     1526#: bp-core/bp-core-admin.php:395 bp-core/bp-core-admin.php:498
    15681527msgid "What’s New"
    15691528msgstr ""
    15701529
    1571 #: bp-core/bp-core-admin.php:398 bp-core/bp-core-admin.php:501
     1530#: bp-core/bp-core-admin.php:397 bp-core/bp-core-admin.php:500
    15721531msgid "Credits"
    15731532msgstr ""
    15741533
    1575 #: bp-core/bp-core-admin.php:403
     1534#: bp-core/bp-core-admin.php:402
    15761535msgid "Getting Started"
    15771536msgstr ""
    15781537
    1579 #: bp-core/bp-core-admin.php:406
     1538#: bp-core/bp-core-admin.php:405
    15801539msgid "Your Default Setup"
    15811540msgstr ""
    15821541
    1583 #: bp-core/bp-core-admin.php:408
     1542#: bp-core/bp-core-admin.php:407
    15841543msgid "BuddyPress&#8217;s powerful features help your users connect and collaborate. To help get your community started, we&#8217;ve activated two of the most commonly used tools in BP: <strong>Extended Profiles</strong> and <strong>Activity Streams</strong>. See these components in action at the %1$s and %2$s directories, and be sure to spend a few minutes <a href=\"%3$s\">configuring user profiles</a>. Want to explore more of BP&#8217;s features? Visit the <a href=\"%4$s\">Components panel</a>."
    15851544msgstr ""
    15861545
    1587 #: bp-core/bp-core-admin.php:409 bp-core/bp-core-template.php:243
     1546#: bp-core/bp-core-admin.php:408 bp-core/bp-core-template.php:243
    15881547#: bp-core/bp-core-widgets.php:113 bp-groups/bp-groups-admin.php:770
    15891548#: bp-groups/bp-groups-template.php:1476 bp-members/bp-members-loader.php:24
    … …  
    15941553msgstr ""
    15951554
     1555#: bp-core/bp-core-admin.php:414
     1556msgid "Community and Support"
     1557msgstr ""
     1558
    15961559#: bp-core/bp-core-admin.php:415
    1597 msgid "Community and Support"
    1598 msgstr ""
    1599 
    1600 #: bp-core/bp-core-admin.php:416
    16011560msgid "Looking for help? The <a href=\"http://codex.buddypress.org/\">BuddyPress Codex</a> has you covered, with dozens of user-contributed guides on how to configure and use your BP site. Can&#8217;t find what you need? Stop by <a href=\"http://buddypress.org/support/\">our support forums</a>, where a vibrant community of BuddyPress users and developers is waiting to share tips, show off their sites, talk about the future of BuddyPress, and much more."
    16021561msgstr ""
    16031562
    1604 #: bp-core/bp-core-admin.php:422
     1563#: bp-core/bp-core-admin.php:421
    16051564msgid "A Declaration of (Theme) Independence"
    16061565msgstr ""
    16071566
     1567#: bp-core/bp-core-admin.php:424
     1568msgid "It Just Works"
     1569msgstr ""
     1570
    16081571#: bp-core/bp-core-admin.php:425
    1609 msgid "It Just Works"
    1610 msgstr ""
    1611 
    1612 #: bp-core/bp-core-admin.php:426
    16131572msgid "BuddyPress is now compatible with <strong>any WordPress theme</strong>. If your theme has BuddyPress-specific templates and styling, we&#8217;ll use them. If not, we provide what you need to make your BuddyPress content look great. Still want to customize? No problem - you can override our templates just like you would in a WordPress child theme. <a href=\"http://codex.buddypress.org/developer-and-designer-information/\">Learn more about theme compatibility</a>."
    16141573msgstr ""
    16151574
    1616 #: bp-core/bp-core-admin.php:431
     1575#: bp-core/bp-core-admin.php:430
    16171576msgid "Group Management"
    16181577msgstr ""
    16191578
    1620 #: bp-core/bp-core-admin.php:434
     1579#: bp-core/bp-core-admin.php:433
    16211580msgid "Get More Done Quickly"
    16221581msgstr ""
    16231582
    1624 #: bp-core/bp-core-admin.php:437
     1583#: bp-core/bp-core-admin.php:436
    16251584msgid "Groups administration panel"
    16261585msgstr ""
    16271586
    1628 #: bp-core/bp-core-admin.php:444
     1587#: bp-core/bp-core-admin.php:443
    16291588msgid "The new %s makes it easy to handle large numbers of groups on your BuddyPress installation. Delete groups, edit group details, modify memberships, and more, with just a few clicks."
    16301589msgstr ""
    16311590
    1632 #: bp-core/bp-core-admin.php:451
     1591#: bp-core/bp-core-admin.php:450
    16331592msgid "Under the Hood"
    16341593msgstr ""
    16351594
     1595#: bp-core/bp-core-admin.php:454
     1596msgid "Faster Member Queries"
     1597msgstr ""
     1598
    16361599#: bp-core/bp-core-admin.php:455
    1637 msgid "Faster Member Queries"
    1638 msgstr ""
    1639 
    1640 #: bp-core/bp-core-admin.php:456
    16411600msgid "The new <code>BP_User_Query</code> makes member queries (like in the Members directory) up to 4x faster than before."
    16421601msgstr ""
    16431602
     1603#: bp-core/bp-core-admin.php:457
     1604msgid "Sortable Profile Options"
     1605msgstr ""
     1606
    16441607#: bp-core/bp-core-admin.php:458
    1645 msgid "Sortable Profile Options"
    1646 msgstr ""
    1647 
    1648 #: bp-core/bp-core-admin.php:459
    16491608msgid "Profile field types with multiple options - like radio buttons and checkboxes - now support drag-and-drop reordering."
    16501609msgstr ""
    16511610
     1611#: bp-core/bp-core-admin.php:462
     1612msgid "New Visibility Level"
     1613msgstr ""
     1614
    16521615#: bp-core/bp-core-admin.php:463
    1653 msgid "New Visibility Level"
    1654 msgstr ""
    1655 
    1656 #: bp-core/bp-core-admin.php:464
    16571616msgid "By popular demand, the \"Admins Only\" visibility setting is now available for profile fields."
    16581617msgstr ""
    16591618
     1619#: bp-core/bp-core-admin.php:465
     1620msgid "Better bbPress Integration"
     1621msgstr ""
     1622
    16601623#: bp-core/bp-core-admin.php:466
    1661 msgid "Better bbPress Integration"
    1662 msgstr ""
    1663 
    1664 #: bp-core/bp-core-admin.php:467
    16651624msgid "Support for group and sitewide forums, using the latest version of the bbPress plugin, is better than ever. Still using bbPress 1.x? Our new migration tools are field-tested."
    16661625msgstr ""
    16671626
    1668 #: bp-core/bp-core-admin.php:472 bp-core/bp-core-admin.php:599
     1627#: bp-core/bp-core-admin.php:471 bp-core/bp-core-admin.php:598
    16691628msgid "Go to the BuddyPress Settings page"
    16701629msgstr ""
    16711630
    1672 #: bp-core/bp-core-admin.php:494
     1631#: bp-core/bp-core-admin.php:493
    16731632msgid "Thank you for updating to the latest version! BuddyPress %s is ready to make your community a safer, faster, and better looking place to hang out!"
    16741633msgstr ""
    16751634
    1676 #: bp-core/bp-core-admin.php:505
     1635#: bp-core/bp-core-admin.php:504
    16771636msgid "BuddyPress is created by a worldwide network of friendly folks."
    16781637msgstr ""
    16791638
    1680 #: bp-core/bp-core-admin.php:507
     1639#: bp-core/bp-core-admin.php:506
    16811640msgid "Project Leaders"
    16821641msgstr ""
    16831642
    1684 #: bp-core/bp-core-admin.php:512
     1643#: bp-core/bp-core-admin.php:511
    16851644msgid "Founding Developer"
    16861645msgstr ""
    16871646
    1688 #: bp-core/bp-core-admin.php:517
     1647#: bp-core/bp-core-admin.php:516
    16891648msgid "Project Lead"
    16901649msgstr ""
    16911650
    1692 #: bp-core/bp-core-admin.php:522 bp-core/bp-core-admin.php:527
     1651#: bp-core/bp-core-admin.php:521 bp-core/bp-core-admin.php:526
    16931652msgid "Lead Developer"
    16941653msgstr ""
    16951654
    1696 #: bp-core/bp-core-admin.php:531
     1655#: bp-core/bp-core-admin.php:530
    16971656msgid "Core Developers"
    16981657msgstr ""
    16991658
    1700 #: bp-core/bp-core-admin.php:539
     1659#: bp-core/bp-core-admin.php:538
    17011660msgid "Recent Rockstars"
    17021661msgstr ""
    17031662
    1704 #: bp-core/bp-core-admin.php:544
     1663#: bp-core/bp-core-admin.php:543
    17051664msgid "Design Officer"
    17061665msgstr ""
    17071666
    1708 #: bp-core/bp-core-admin.php:549
     1667#: bp-core/bp-core-admin.php:548
    17091668msgid "Support Officer"
    17101669msgstr ""
    17111670
    1712 #: bp-core/bp-core-admin.php:553
     1671#: bp-core/bp-core-admin.php:552
    17131672msgid "Core Contributors to BuddyPress 1.7"
    17141673msgstr ""
    … …  
    38063765msgstr ""
    38073766
    3808 #: bp-loader.php:531
     3767#: bp-loader.php:530
    38093768msgid "BuddyPress Default"
    38103769msgstr ""

  • trunk/bp-loader.php

    r7097 r7099  
    281281        $this->version    = '1.8-bleeding-7013';
    282282        $this->db_version = 6080;
    283         $this->glotpress_version = 'dev';
    284283
    285284        /** Loading ***********************************************************/
Note: See TracChangeset for help on using the changeset viewer.