Permalink
Browse files

Resolved some untranslatable text strings and multisite related code …

…changes
  • Loading branch information...
1 parent 994b2b5 commit 0414ee25b4510e6e5fc15d6d29b9f1ca57840c04 Joshua Abenazer committed Feb 4, 2013
@@ -30,7 +30,7 @@ public function __construct() {
if (current_user_can('manage_options'))
add_action('bp_admin_tabs', array($this, 'tab'));
if (is_multisite())
- add_action('network_admin_edit_bp_media_options', array($this, 'save_multisite_options'));
+ add_action('network_admin_edit_bp_media', array($this, 'save_multisite_options'));
}
$this->bp_media_upgrade = new BPMediaUpgrade();
$this->bp_media_settings = new BPMediaSettings();
@@ -105,13 +105,10 @@ public function render_page($page, $option_group = NULL) {
<div id="bp-media-settings-boxes">
<?php
- $settings_url = ( is_multisite() ) ? network_admin_url('edit.php?action=bp_media_options') : 'options.php';
+ $settings_url = ( is_multisite() ) ? network_admin_url('edit.php?action=' . $option_group) : 'options.php';
?>
<form id="bp_media_settings_form" name="bp_media_settings_form" action="<?php echo $settings_url; ?>" method="post" enctype="multipart/form-data">
<div class="bp-media-metabox-holder"><?php
-// if (isset($_REQUEST['request_type'])) {
-// bp_media_bug_report_form($_REQUEST['request_type']);
-// } else {
if ($option_group) {
settings_fields($option_group);
do_settings_sections($page);
@@ -241,7 +238,6 @@ public function update_count() {
/* Multisite Save Options - http://wordpress.stackexchange.com/questions/64968/settings-api-in-multisite-missing-update-message#answer-72503 */
public function save_multisite_options() {
-
global $bp_media_admin;
if (isset($_POST['refresh-count'])) {
$bp_media_admin->update_count();
View
0 app/assets/img/Popup-title-bg.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -53,17 +53,17 @@ public function settings() {
add_settings_section('bpm-other', __('BuddyPress Media Other Options', BP_MEDIA_TXT_DOMAIN), '', 'bp-media-settings');
add_settings_field('bpm-other-settings', __('Re-Count Media Entries', BP_MEDIA_TXT_DOMAIN), array($this, 'button'), 'bp-media-settings', 'bpm-other', array(
'option' => 'refresh-count',
- 'name' => 'Re-Count',
+ 'name' => __('Re-Count', BP_MEDIA_TXT_DOMAIN),
'desc' => __('It will re-count all media entries of all users and correct any discrepancies.', BP_MEDIA_TXT_DOMAIN)
));
$bp_media_addon = new BPMediaAddon();
add_settings_section('bpm-addons', __('BuddyPress Media Addons for Audio/Video Conversion', BP_MEDIA_TXT_DOMAIN), array($bp_media_addon, 'get_addons'), 'bp-media-addons');
add_settings_section('bpm-support', __('Submit a request form', BP_MEDIA_TXT_DOMAIN), '', 'bp-media-support');
add_settings_field('bpm-request', __('Request Type', BP_MEDIA_TXT_DOMAIN), array($this, 'dropdown'), 'bp-media-support', 'bpm-support', array('option' => 'select-request', 'none' => false, 'values' => array(
- '' => '--Select One--',
- 'premium_support' => 'Premium Support',
- 'new_feature' => 'Suggest a New Feature',
- 'bug_report' => 'Submit a Bug Report')
+ '' => '-- ' . __('Select One', BP_MEDIA_TXT_DOMAIN) . ' --',
+ 'premium_support' => __('Premium Support', BP_MEDIA_TXT_DOMAIN),
+ 'new_feature' => __('Suggest a New Feature', BP_MEDIA_TXT_DOMAIN),
+ 'bug_report' => __('Submit a Bug Report', BP_MEDIA_TXT_DOMAIN))
));
register_setting('bp_media', 'bp_media_options', array($this, 'sanitize'));
}
View
0 app/helper/rtPluginInfo.php 100644 → 100755
No changes.
View
0 app/helper/rtPluginUpdate.php 100644 → 100755
No changes.
View
No changes.
View
No changes.
View
0 config/index.php 100644 → 100755
No changes.
View
0 lib/index.php 100644 → 100755
No changes.
View
0 log/index.php 100644 → 100755
No changes.

0 comments on commit 0414ee2

Please sign in to comment.