Index: l10n_community/export.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/Attic/export.inc,v retrieving revision 1.1.2.15.2.13 diff -u -p -r1.1.2.15.2.13 export.inc --- l10n_community/export.inc 5 Sep 2009 17:57:56 -0000 1.1.2.15.2.13 +++ l10n_community/export.inc 12 Sep 2009 11:49:38 -0000 @@ -145,7 +145,7 @@ function l10n_community_export_form_vali if (empty($form_state['values']['project'])) { form_set_error('project', t('You should choose a project, submit the form and choose a release.')); } - else if (!$project = l10n_community_project_uri_by_title($form_state['values']['project'])) { + elseif (!$project = l10n_community_project_uri_by_title($form_state['values']['project'])) { form_set_error('project', t('Invalid project chosen.')); $form_state['values']['project'] = ''; } @@ -374,7 +374,7 @@ function _l10n_community_export_string_f * directory structure generated, the others are suitable packages for the * given Drupal version. * @param $compact - * A compact export will skip outputting the comments, superfluous + * A compact export will skip outputting the comments, superfluous * newlines and the list of files. TRUE or FALSE. * * @todo Index: l10n_community/import.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/Attic/import.inc,v retrieving revision 1.1.2.5.2.9 diff -u -p -r1.1.2.5.2.9 import.inc --- l10n_community/import.inc 5 Sep 2009 13:17:05 -0000 1.1.2.5.2.9 +++ l10n_community/import.inc 12 Sep 2009 11:50:25 -0000 @@ -79,7 +79,7 @@ function l10n_community_import_form($for */ function l10n_community_import_form_submit($form, &$form_state) { global $user; - + // Save file in the local file system. if ($file = file_save_upload('file')) { @@ -87,7 +87,7 @@ function l10n_community_import_form_subm if (!ini_get('safe_mode')) { @set_time_limit(240); } - + // Calculate the uid to use for attribution. $uid = $user->uid; if (!empty($form_state['values']['attribute_to_import_account'])) { @@ -316,7 +316,7 @@ function _l10n_community_import_one_stri if (empty($uid)) { $uid = $user->uid; } - + // If the comment array for this value contains the ', fuzzy' flag, then // mark this as a suggestion import in all cases. if (!empty($value['#'])) { Index: l10n_community/l10n_community.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/Attic/l10n_community.module,v retrieving revision 1.1.2.23.2.46 diff -u -p -r1.1.2.23.2.46 l10n_community.module --- l10n_community/l10n_community.module 10 Sep 2009 08:41:23 -0000 1.1.2.23.2.46 +++ l10n_community/l10n_community.module 12 Sep 2009 11:48:11 -0000 @@ -1097,7 +1097,7 @@ function l10n_community_target_save($sid else { // No active translation exists. if ($suggestion) { - // No translation yet -> INSERT empty placeholder so we can track + // No translation yet -> INSERT empty placeholder so we can track // suggestions. We track and exclude these by translation = '' later. db_query("INSERT INTO {l10n_community_translation} (sid, translation, language, uid_entered, time_entered, has_suggestion, is_active) VALUES (%d, '', '%s', 0, %d, 1, 1)", $sid, $langcode, time()); db_query("INSERT INTO {l10n_community_translation} (sid, language, translation, uid_entered, time_entered, is_suggestion, is_active) VALUES (%d, '%s', '%s', %d, %d, 1, 1)", $sid, $langcode, $translation, $uid, time()); @@ -1200,7 +1200,7 @@ function l10n_community_projects_autocom $result = db_query_range("SELECT title FROM {l10n_community_project} WHERE LOWER(title) LIKE LOWER('%s%%') AND status = 1 ORDER BY title", $string, 0, 100); while ($project = db_fetch_object($result)) { $matches[$project->title] = check_plain($project->title); - } + } } print drupal_to_js($matches); exit(); @@ -1400,7 +1400,7 @@ function l10n_community_format_text($str if (isset($sid) && isset($delta)) { $class = ' class="string-'. $sid .'-'. $delta .'"'; } - else if ($sid) { + elseif ($sid) { $class = ' class="string-'. $sid .'"'; } return ''. $formatted .''; Index: l10n_community/pages.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/Attic/pages.inc,v retrieving revision 1.1.2.20.2.18 diff -u -p -r1.1.2.20.2.18 pages.inc --- l10n_community/pages.inc 1 Sep 2009 15:08:59 -0000 1.1.2.20.2.18 +++ l10n_community/pages.inc 12 Sep 2009 11:52:25 -0000 @@ -218,7 +218,7 @@ function l10n_community_overview_project $project = l10n_community_get_projects(array('uri' => $uri)); $output .= l10n_community_language_progress_for_project($project, $languages, t('Translations overview'), t('Overall status of translations')); - + $output .= '
'; $block = array( @@ -298,7 +298,7 @@ function l10n_community_language_progres $table, array('class' => 'l10n-community-overview') ) .'
'; - + return theme('admin_block', $block); } Index: l10n_community/welcome.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/Attic/welcome.inc,v retrieving revision 1.1.2.7.2.8 diff -u -p -r1.1.2.7.2.8 welcome.inc --- l10n_community/welcome.inc 28 Aug 2009 15:56:45 -0000 1.1.2.7.2.8 +++ l10n_community/welcome.inc 12 Sep 2009 11:53:00 -0000 @@ -82,7 +82,7 @@ function l10n_community_welcome_page() { 'content' => '
'. $content .'
' ); $output .= str_replace('class="admin-panel"', 'class="admin-panel admin-panel-contribute"', theme('admin_block', $block)); - + if (($highlight_project = variable_get('l10n_community_highlighted_project', '')) && ($project = db_fetch_object(db_query("SELECT * FROM {l10n_community_project} WHERE title = '%s'", array($highlight_project))))) { // Display progress status of the highlighted project. include_once drupal_get_path('module', 'l10n_community') .'/pages.inc'; Index: l10n_community/tests/l10n_community.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/tests/Attic/l10n_community.test,v retrieving revision 1.1.2.7 diff -u -p -r1.1.2.7 l10n_community.test --- l10n_community/tests/l10n_community.test 10 Sep 2009 08:22:55 -0000 1.1.2.7 +++ l10n_community/tests/l10n_community.test 12 Sep 2009 11:55:57 -0000 @@ -7,10 +7,10 @@ */ class L10nServerTestCase extends DrupalWebTestCase { - + private $version_base = '3.5'; private $version_js = '5.7'; - + public static function getInfo() { return array( 'name' => t('Localization server'), @@ -40,27 +40,27 @@ class L10nServerTestCase extends DrupalW else { simpletest_clean_temporary_directory(file_directory_path() .'/l10n_community_test'); } - + // Set local package directory, so we can work with this. $this->drupalLogin($this->u_admin); $edit['l10n_localpacks_directory'] = $this->temp_path; $this->drupalPost('admin/l10n_server/l10n_localpacks', $edit, t('Save configuration')); $this->assertText(t('The configuration options have been saved.'), t('Local package directory set.')); - + $this->project_names = array(); } - + /** * Test accessibility of welcome screen. */ public function testWelcome() { - // Non-priviledged users should not have access to the welcome screen. + // Non-priviledged users should not have access to the welcome screen. $this->drupalLogin($this->u_anon); $this->drupalGet('translate'); $this->assertNoText(t('Quick stats'), t('Welcome screen not visible to non-priviledged user.')); $this->drupalGet('user/logout'); - - // Priviledged users should have access to the welcome screen. + + // Priviledged users should have access to the welcome screen. $this->drupalLogin($this->u_auth); $this->drupalGet('translate'); $this->assertText(t('Quick stats'), t('Welcome screen visible to priviledged user.')); @@ -71,21 +71,21 @@ class L10nServerTestCase extends DrupalW * Test languages and projects and basic project addition. */ public function testLanguagesProjects() { - // Non-priviledged users should not have access to the welcome screen. + // Non-priviledged users should not have access to the welcome screen. $this->drupalLogin($this->u_auth); $this->drupalGet('translate/languages'); $this->assertText(t('No languages to list.'), t('Language list empty on start.')); $this->drupalGet('user/logout'); - + // Add a language to the environment. $this->addLanguage(); - + // Check that l10n_server now gives us a different error. $this->drupalLogin($this->u_auth); $this->drupalGet('translate/languages'); $this->assertText(t('No strings to translate.'), t('Language now recognized, but still no strings to translate.')); $this->drupalGet('user/logout'); - + // Add and parse projects in the environment. $this->addProject(5); $this->addProject(6); @@ -113,9 +113,9 @@ class L10nServerTestCase extends DrupalW $this->assertText(t('1 release parsed'), t('One release parsed on project.')); } } - + // PROJECTS ==== - + // Check that the base list of strings are there. $this->drupalGet('translate/languages/hu/view', array('query' => 'limit=30')); $this->assertMsgID('This is a test string.'); @@ -165,7 +165,7 @@ class L10nServerTestCase extends DrupalW $this->assertCount('project_names[6])); $this->drupalGet('translate/languages/hu/view', array('query' => 'limit=30&project='. $this->project_names[6] .'&release='. $rid)); @@ -181,7 +181,7 @@ class L10nServerTestCase extends DrupalW $this->assertCount('drupalGet('translate/languages/hu/view', array('query' => 'limit=30&context=Test%20context')); $this->assertMsgIDContext('Test string in context', 'Test context'); @@ -199,7 +199,7 @@ class L10nServerTestCase extends DrupalW $this->assertRaw(t('No strings found with this filter. Try adjusting the filter options.')); // SEARCH ==== - + // Filtering for text contained works. $this->drupalGet('translate/languages/hu/view', array('query' => 'limit=30&search=is%20a')); $this->assertMsgID('This is a test string.'); @@ -219,14 +219,14 @@ class L10nServerTestCase extends DrupalW $this->assertCount('drupalGet('translate/details/hu/'. $sid); $this->assertRaw(''. $this->project_names[5] .': 5.x-'. $this->version_js .' (1)'); $this->assertRaw(''. $this->project_names[6] .': 6.x-'. $this->version_js .' (1), 6.x-'. $this->version_base .' (1)'); $this->assertRaw(''. $this->project_names[7] .': 7.x-'. $this->version_js .' (1)'); } - + /** * Test submitting suggestions. */ @@ -243,7 +243,7 @@ class L10nServerTestCase extends DrupalW $this->assertMsgID('This is a test string.'); // SUBMIT SUGGESTIONS ==== - + // Add suggestions for four strings. $edit = array(); $sid1 = db_result(db_query("SELECT sid FROM {l10n_community_string} WHERE value = '%s'", 'This is a test string.')); @@ -268,7 +268,7 @@ class L10nServerTestCase extends DrupalW $this->assertRaw(t('@count new suggestions added.', array('@count' => 2))); // CHECK SUGGESTIONS ==== - + $this->drupalGet('translate/suggestions/hu/'. $sid1); $this->assertMsgID('This is a test string. suggestion'); $this->assertMsgID('This is a test string. suggestion-2'); @@ -291,7 +291,7 @@ class L10nServerTestCase extends DrupalW $this->assertRaw('by '. $this->u_member_1->name .''); // CHECK LISTINGS ==== - + $this->drupalGet('translate/languages/hu/edit', array('query' => 'limit=30')); $this->assertCount('drupalGet('user/logout'); $this->drupalLogin($this->u_moderator); - + $this->drupalGet('translate/languages/hu/moderate', array('query' => 'limit=30')); $this->assertCount('assertRaw('This is a test string. suggestion'); $this->assertRaw('Test string in context. suggestion-1'); $this->assertRaw('Test string in context. suggestion-2'); - + $this->drupalGet('translate/languages/hu/moderate', array('query' => 'limit=30&project='. $this->project_names[6])); $this->assertCount('assertRaw('This is a test string. suggestion'); @@ -323,12 +323,12 @@ class L10nServerTestCase extends DrupalW $this->assertRaw('This is a test string. suggestion'); $this->assertNoRaw('Test string in context. suggestion-1'); $this->assertRaw('Test string in context. suggestion-2'); - + $this->drupalGet('translate/languages/hu/moderate', array('query' => 'limit=30&context=Test%20context')); $this->assertCount('assertRaw('Test string in context. suggestion-2'); $this->assertRaw('Test string in context. suggestion-3'); - + $this->drupalGet('translate/languages/hu/moderate', array('query' => 'limit=30&search=is%20a')); $this->assertCount('assertRaw('This is a test string. suggestion'); @@ -353,7 +353,7 @@ class L10nServerTestCase extends DrupalW $this->assertCount('assertText(t('@count suggestions have been approved.', array('@count' => 2))); $this->assertNoRaw('This is a test string. suggestion-2'); - + // Add 2 new suggestions and 1 translation for the fun of testing. $edit = array(); $edit[$sid1 .'[translation][value]'] = 'This is a test string. suggestion-3'; @@ -371,7 +371,7 @@ class L10nServerTestCase extends DrupalW $edit[$sid3 .'[translation][value]'] = 'Test string in context. suggestion-5'; $edit[$sid3 .'[translation][is_suggestion]'] = 1; $this->drupalPost('translate/languages/hu/edit', $edit, t('Save translations'), array('query' => 'limit=30')); - + // Three strings should have translations. $this->drupalGet('translate/languages/hu/view', array('query' => 'limit=30&status=2')); $this->assertMsgID('This is a test string.'); @@ -427,7 +427,7 @@ class L10nServerTestCase extends DrupalW $this->assertText(t('@count suggestions have been declined.', array('@count' => 2))); // INDIVIDUAL DECLINE ==== - + $tid = db_result(db_query("SELECT tid FROM {l10n_community_translation} WHERE translation = '%s' AND language = '%s'", 'Test string in context. suggestion-3', 'hu')); $this->drupalGet('translate/suggestions/hu/'. $sid3); $this->assert((bool) preg_match("!". $tid .",". $sid3 .", this, '([a-z0-9]+)'!", $this->content, $found), t('Found token for decline action.')); @@ -439,7 +439,7 @@ class L10nServerTestCase extends DrupalW $this->assertCount('drupalGet('translate/suggestions/hu/'. $sid3); $this->assert((bool) preg_match("!". $tid .",". $sid3 .", this, '([a-z0-9]+)'!", $this->content, $found), t('Found token for approve action.')); @@ -452,7 +452,7 @@ class L10nServerTestCase extends DrupalW $this->assertCount('assertRaw('This is a test string. suggestion-3'); } - + /** * Look for a string appearance on the page for $raw. */ @@ -464,10 +464,10 @@ class L10nServerTestCase extends DrupalW $message = t('String "@raw" not found', array('@raw' => $raw)); } $found = strpos($this->content, ''); - $found = $match ? ($found !== FALSE) : ($found === FALSE); + $found = $match ? ($found !== FALSE) : ($found === FALSE); return $this->assert($found, $message); } - + /** * Look for a singular/plural string appearance on the page for $raw. */ @@ -518,15 +518,15 @@ class L10nServerTestCase extends DrupalW $this->assertText(t('Hungarian'), t('Hungarian language added to system.')); $this->drupalGet('user/logout'); } - + /** * Add a project with the given API version. */ private function addProject($api_version = 6, $include_js = TRUE) { include_once 'Archive/Tar.php'; - - $version = $api_version .'.x-'. ($include_js ? $this->version_js : $this->version_base); - + + $version = $api_version .'.x-'. ($include_js ? $this->version_js : $this->version_base); + // Follow the required file name format, so the package connector finds it. // Include api version name in file basename too (before version string), // to ensure that it is easier to debug what strings appear where. @@ -540,7 +540,7 @@ class L10nServerTestCase extends DrupalW } $package_file = $temp_file .'-'. $version .'.tar.gz'; $tar = new Archive_Tar($package_file, 'gz'); - + // Add the files as strings, so we can control their placement/name. $tar->addString('potx_test_'. $api_version .'.module', file_get_contents(drupal_get_path('module', 'potx') .'/tests/potx_test_'. $api_version .'.module')); // Add .info file tailored to the module filename (although this is not @@ -551,7 +551,7 @@ class L10nServerTestCase extends DrupalW // not pick this up, this packaging allows us to test for that exactly. $tar->addString('potx_test_'. $api_version .'.js', file_get_contents(drupal_get_path('module', 'potx') .'/tests/potx_test.js')); } - + $this->assertTrue(file_exists($package_file), t('Test package created.')); $this->assertTrue(filesize($package_file) > 0, t('Test package contains data.')); $this->pass('Temporary file at '. $package_file); @@ -562,8 +562,8 @@ class L10nServerTestCase extends DrupalW $this->drupalGet('admin/l10n_server/l10n_localpacks/scan'); $this->assertRaw(t('Contents of %filename have been scanned.', array('%filename' => $package_file)), t('Contents of project tarball parsed.')); $this->drupalGet('user/logout'); - } - + } + /** * Debug functionality until simpletest built-in debugging is backported. */ Index: l10n_remote/l10n_remote.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_remote/Attic/l10n_remote.module,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 l10n_remote.module --- l10n_remote/l10n_remote.module 20 Oct 2008 22:29:52 -0000 1.1.2.1 +++ l10n_remote/l10n_remote.module 12 Sep 2009 11:54:13 -0000 @@ -4,9 +4,9 @@ /** * @file * Localization XML-RPC server for remote translation submissions. - * + * * Adds XML-RPC support for remote string submissions, to be used by l10n_client. - * + * * @todo Add automatic API key retrieval, where user just clicks and accepts. */ @@ -53,8 +53,8 @@ function l10n_remote_user_page($client_t } $items[] = array( - '#type' => 'item', - '#title' => t('Your Localization Server API key'), + '#type' => 'item', + '#title' => t('Your Localization Server API key'), '#value' => l10n_remote_user_api_key($user->uid, $client_token), '#description' => t('Copy and paste this API key into your user account on the client host.'), ); @@ -63,7 +63,7 @@ function l10n_remote_user_page($client_t /** * Get API key for remote submission - * + * * This API key will contain a visible user id and a signature from the server. */ function l10n_remote_user_api_key($uid, $client_token) { @@ -119,31 +119,31 @@ function l10n_remote_xmlrpc_string_submi // Check signature and permission parameters. if ($uid && $signature == md5(l10n_remote_user_api_key($uid, $client_token) . $langcode . $source . $translation . $client_token)) { if (($account = user_load($uid)) && $account->status && user_access('access localization community', $account) && user_access('submit suggestions remotely', $account)) { - watchdog('l10n_community', 'Submitted translation from client.'); - // Check for existing string, and *always* save this as suggestion. - $languages = l10n_community_get_languages('name'); - - if (!isset($languages[$langcode])) { - watchdog('l10n_community', 'Language not allowed for remote submission.', NULL, WATCHDOG_WARNING); - return array('status' => FALSE, 'reason' => 'Language not accepted.'); - } - elseif (l10n_community_get_permission($langcode, $account) == L10N_PERM_NONE) { - watchdog('l10n_community', 'Not allowed to submit translations in this language remotely.', NULL, WATCHDOG_WARNING); - return array('status' => FALSE, 'reason' => 'Not allowed to submit translations in this language.'); - } - elseif ($sid = db_result(db_query("SELECT sid FROM {l10n_community_string} WHERE value = '%s'", $source))) { - l10n_community_target_save($sid, $translation, $langcode, $uid, TRUE, $inserted, $updated, $unchanged, $suggested); - return array('status' => TRUE, 'sid' => $sid); - } - else { - return array('status' => FALSE, 'reason' => 'Source string not found on server list.'); - } + watchdog('l10n_community', 'Submitted translation from client.'); + // Check for existing string, and *always* save this as suggestion. + $languages = l10n_community_get_languages('name'); + + if (!isset($languages[$langcode])) { + watchdog('l10n_community', 'Language not allowed for remote submission.', NULL, WATCHDOG_WARNING); + return array('status' => FALSE, 'reason' => 'Language not accepted.'); + } + elseif (l10n_community_get_permission($langcode, $account) == L10N_PERM_NONE) { + watchdog('l10n_community', 'Not allowed to submit translations in this language remotely.', NULL, WATCHDOG_WARNING); + return array('status' => FALSE, 'reason' => 'Not allowed to submit translations in this language.'); + } + elseif ($sid = db_result(db_query("SELECT sid FROM {l10n_community_string} WHERE value = '%s'", $source))) { + l10n_community_target_save($sid, $translation, $langcode, $uid, TRUE, $inserted, $updated, $unchanged, $suggested); + return array('status' => TRUE, 'sid' => $sid); + } + else { + return array('status' => FALSE, 'reason' => 'Source string not found on server list.'); + } } else { watchdog('l10n_community', 'Unauthorized or blocked user attempted submission.', NULL, WATCHDOG_WARNING); return array('status' => FALSE, 'reason' => 'No permission to submit translations.'); } - } + } else { watchdog('l10n_community', 'Submitted translation with wrong parameters or signature.', NULL, WATCHDOG_WARNING); return array('status' => FALSE, 'reason' => 'Wrong parameters or signature.');