diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/aggregator.module | 88 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.module | 88 | ||||
| -rw-r--r-- | modules/import.module | 88 |
3 files changed, 147 insertions, 117 deletions
diff --git a/modules/aggregator.module b/modules/aggregator.module index f752904ba..8d47d238f 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -8,25 +8,24 @@ function import_help($section = "admin/import/help") { switch ($section) { case 'admin/help': case 'admin/import/help': - $output .= strtr("<p>Thousands of web sites, especially news sites and weblogs, syndicate their most recent site content for others to display. The syndicated content always includes titles, also known as headlines, for the newest published stories. Each headline acts as a direct link to the stories on the remote site. Along with the headline, most sites typically provide either the first few paragraphs of the story or a short summary. Many individuals use client-based news aggregators on their personal computer to aggregate content, such as %amphetadesk</p>", array("%amphetadesk" => "<a href=\"http://www.disobey.com/amphetadesk/\">". t("AmphetaDesk") ."</a>")); - + $output .= "<p>Thousands of web sites, especially news sites and weblogs, syndicate their most recent site content for others to display. The syndicated content always includes titles, also known as headlines, for the newest published stories. Each headline acts as a direct link to the stories on the remote site. Along with the headline, most sites typically provide either the first few paragraphs of the story or a short summary. Many individuals use client-based news aggregators on their personal computer to aggregate content, such as %amphetadesk</p>"; $output .= "<p>Drupal also has a news aggregator built in as a standard feature. With it, you can subscribe to feeds from other sites and display their content for your site users. Simply enable the import module in site administration and enter the feeds that you choose.</p>"; $output .= "<h3>What do I need to subscribe to a feed?</h3>"; - $output .= strtr("<p>The standard method of syndication is using the XML-based %rss (RSS). To syndicate a site's content, obtain the full URL of the RSS page providing syndication. Common file tags for RSS pages are .rss, .xml and .rdf. Example: %slashdot-rss.</p>", array("%rss" => "<a href=\"http://groups.yahoo.com/group/rss-dev/files/specification.html\">". t("Rich Site Summary") ."</a>", "%slashdot-rss" => "<a href=\"http://slashdot.org/slashdot.rdf\">". t("http://slashdot.org/slashdot.rfd") ."</a>")); + $output .= "<p>The standard method of syndication is using the XML-based %rss (RSS). To syndicate a site's content, obtain the full URL of the RSS page providing syndication. Common file tags for RSS pages are .rss, .xml and .rdf. Example: %slashdot-rss.</p>"; $output .= "<p>Most weblog sites that offer syndication will have an obvious link on the main page. Often you need only look for an xml syndication button, such as the one Drupal uses for site syndication.</p>"; - $output .= strtr("<p>But some sites do not make their RSS feeds as easy to find. Or maybe you want to find a number of feeds on a given topic, without extensively searching the web. In that case, try an RSS syndication directory such as %syndic8.</p>", array("%syndic8" => "<a href=\"http://www.syndic8.com/\">". t("Syndic8") ."</a>")); - $output .= strtr("<p>To learn much more about RSS, read Mark Pilgrim's %rss-what and WebReference.com's %rss-evolution.</p>", array("%rss-what" => "<a href=\"http://www.xml.com/pub/a/2002/12/18/dive-into-xml.html\">". t("What is RSS") ."</a>", "%rss-evolution" => "<a href=\"http://www.webreference.com/authoring/languages/xml/rss/1/\">". t("The Evolution of RSS") ."</a>")); + $output .= "<p>But some sites do not make their RSS feeds as easy to find. Or maybe you want to find a number of feeds on a given topic, without extensively searching the web. In that case, try an RSS syndication directory such as %syndic8.</p>"; + $output .= "<p>To learn much more about RSS, read Mark Pilgrim's %rss-what and WebReference.com's %rss-evolution.</p>"; $output .= "<p>NOTE: Enable your site's xml syndication button by turning on the Syndicate block in block management.</p>"; $output .= "<h3>Configuring news feeds</h3>"; - $output .= strtr("<p>To subscribe to an RSS feed on another site, use the %admin-news shortcut at the top of the news aggregation page. The link leads directly to the news aggregation configuration section of Drupal site administration.</p>", array("%admin-news" => l(t("administer news feeds"), "admin/node/syndication/news"))); - $output .= strtr("<p>Once there, select %new-feed from the left hand menu. Drupal will then ask for the following:</p>", array("%new-feed" => l(t("add new feed"), "admin/node/syndication/news/add/feed") )); + $output .= "<p>To subscribe to an RSS feed on another site, use the %admin-news shortcut at the top of the news aggregation page. The link leads directly to the news aggregation configuration section of Drupal site administration.</p>"; + $output .= "<p>Once there, select %new-feed from the left hand menu. Drupal will then ask for the following:</p>"; $output .= "<ul>"; $output .= "<li><b>Title</b> -- The text entered here will be used in your news aggregator, within the administration configuration section, and as title for the news feed block. As a general rule, use the web site name from which the feed originates.</li>"; $output .= " <li><b>URL</b> -- Here you'll enter the fully-qualified URL for the feed for the site you want to subscribe to.</li>"; $output .= "<li><b>Attributes</b> -- Attributes are keywords which can be used to collect feeds into <i>bundles</i> (see below). Think of these as the means of classifying your feeds. Separate multiple attributes with commas. If you do not plan on using the specific feed in a bundle, this input field can be left blank.</li>"; - $output .= strtr("<li><b>Update interval</b> -- The update interval is how often Drupal will automatically access the RSS URL for the site for fresh content. The 1 hour default is typically the minimum you will want to use. Accessing another site's RSS page more frequently can be considered impolite. After all, it does require the other site's server handle your requests. To use this feature cron.php must be called regularly, otherwise, you'll have to manually update feeds one at a time within the news aggregation administration section by using %update-items.</li>", array("%update-items" => l(t("update items"), "admin/node/syndication/news") )); + $output .= "<li><b>Update interval</b> -- The update interval is how often Drupal will automatically access the RSS URL for the site for fresh content. The 1 hour default is typically the minimum you will want to use. Accessing another site's RSS page more frequently can be considered impolite. After all, it does require the other site's server handle your requests. To use this feature cron.php must be called regularly, otherwise, you'll have to manually update feeds one at a time within the news aggregation administration section by using %update-items.</li>"; $output .= "</ul>"; - $output .= strtr("<p>Once you submit your new feed, check to see if it is working properly. Select %update-items on the %main-aggregation page. If you do not see any items listed for that feed, edit the feed and make sure that the URL was entered correctly.</p>", array("%update-items" => l(t("update items"), "admin/node/syndication/news"), "%main-aggregation" => l(t("main news aggregation"), "admin/node/syndication/news") )); + $output .= "<p>Once you submit your new feed, check to see if it is working properly. Select %update-items on the %admin-news page. If you do not see any items listed for that feed, edit the feed and make sure that the URL was entered correctly.</p>"; $output .= "<h3>Adding bundles</h3>"; $output .= "<p>You may want to follow some feeds more closely than others. Or perhaps you'd like to display a select list of the titles for some feeds as a block for users. Bundles are a way of grouping your feeds into categories. Bundles look for feeds that contain at least one of the keywords, or attributes, associated with the bundle and display those feeds together.</p>"; $output .= "<p>When adding a bundle, Drupal will ask for:</p>"; @@ -52,28 +51,39 @@ function import_help($section = "admin/import/help") { $output .= "</ul>"; $output .= "<h3>RSS feed blocks</h3>"; $output .= "<p>In addition to providing subscribed content through the news aggregator, Drupal automatically creates a block for each subscribed feed and every bundle created. Beside each headline in each block, Drupal includes an icon which acts a blog it link. Enable any or all of the blocks using block management.</p>"; + $output = t($output, array( + "%amphetadesk" => "<a href=\"http://www.disobey.com/amphetadesk/\">AmphetaDesk</a>", + "%rss" => "<a href=\"http://groups.yahoo.com/group/rss-dev/files/specification.html\">Rich Site Summary</a>", + "%slashdot-rss" => "<a href=\"http://slashdot.org/slashdot.rdf\">http://slashdot.org/slashdot.rfd</a>", + "%syndic8" => "<a href=\"http://www.syndic8.com/\">Syndic8</a>", + "%rss-what" => "<a href=\"http://www.xml.com/pub/a/2002/12/18/dive-into-xml.html\">What is RSS</a>", + "%rss-evolution" => "<a href=\"http://www.webreference.com/authoring/languages/xml/rss/1/\">The Evolution of RSS</a>", + "%admin-news" => l(t("RSS/RDF"), "admin/node/syndication/news"), + "%new-feed" => l(t("new feed"), "admin/node/syndication/news/add/feed"), + "%update-items" => l(t("update items"), "admin/node/syndication/news"), + )); break; case 'admin/system/modules': - $output = "Used to aggregate syndicated content (RSS and RDF)."; + $output = t("Used to aggregate syndicated content (RSS and RDF)."); break; case 'admin/system/modules/import': - $output = "Drupal's news aggregator controls how many RSS/RDF items from a single source are displayed in a \"Block\", and on the page that goes with that block."; + $output = t("Drupal's news aggregator controls how many RSS/RDF items from a single source are displayed in a \"Block\", and on the page that goes with that block."); break; case 'admin/node/syndication/news': - $output = strtr("Several web sites, especially news related sites, syndicate parts of their site's content for other web sites to display. Usually, the syndicated content includes the latest headlines with a direct link to that story on the remote site. Some syndicated content also includes a description of the headline. The standard method of syndication is using the XML based Rich Site Summary (RSS). To get a feed to work you <b>must</b> run \"cron.php\". To display the feed in a block you must turn on the %block. <br /><ul><li>To delete a feed choose \"edit feed\"</li><li>To clear all of the entries from a feed choose \"Remove items\"</li><li>To check whether a feed is working, and to get new items <b>now</b> click on \"update items\"</li></ul><ul><li>To delete a bundle choose \"edit bundle\".</li></ul>", array("%block" => l(t("feed's block"), "admin/block") )); + $output = t("Several web sites, especially news related sites, syndicate parts of their site's content for other web sites to display. Usually, the syndicated content includes the latest headlines with a direct link to that story on the remote site. Some syndicated content also includes a description of the headline. The standard method of syndication is using the XML based Rich Site Summary (RSS). To get a feed to work you <b>must</b> run \"cron.php\". To display the feed in a block you must turn on the %block. <br /><ul><li>To delete a feed choose \"edit feed\"</li><li>To clear all of the entries from a feed choose \"Remove items\"</li><li>To check whether a feed is working, and to get new items <b>now</b> click on \"update items\"</li></ul><ul><li>To delete a bundle choose \"edit bundle\".</li></ul>", array("%block" => l(t("feed's block"), "admin/system/block") )); break; case 'admin/node/syndication/news/add/feed': - $output = strtr("Add a site that has an RSS/RDF feed. The URL is the full path to the RSS feed file. For the feed to update automatically you must run \"cron.php\". The \"Attributes\" are used to bundle this feed with other feeds (See %bundle), and to tag articles from this feed.<br />Note: If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.", array("%bundle" => l(t("add new bundle"), "admin/node/syndication/news/add/bundle") )); + $output = t("Add a site that has an RSS/RDF feed. The URL is the full path to the RSS feed file. For the feed to update automatically you must run \"cron.php\". The \"Attributes\" are used to bundle this feed with other feeds (See %bundle), and to tag articles from this feed.<br />Note: If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.", array("%bundle" => l(t("add new bundle"), "admin/node/syndication/news/add/bundle") )); break; case 'admin/node/syndication/news/add/bundle': - $output = strtr("Bundles provide a generalized way of creating composite feeds. They allow you, for example, to combine various sport-related feeds into one bundle called <i>Sport</i>. If an article from a feed has been \"tag\"-ged (See %tag too look at and change tags.) with a matching \"Attribute\" then it will be added to the bundle.", array("%tag" => l(t("tag news item"), "admin/node/syndication/news/tag") )); + $output = t("Bundles provide a generalized way of creating composite feeds. They allow you, for example, to combine various sport-related feeds into one bundle called <i>Sport</i>. If an article from a feed has been \"tag\"-ged (See %tag too look at and change tags.) with a matching \"Attribute\" then it will be added to the bundle.", array("%tag" => l(t("tag news item"), "admin/node/syndication/news/tag") )); break; case 'admin/node/syndication/news/tag': - $output = "This allows you to see and change an news item's \"tag\". All articles are originally tagged with the \"Attributes\" of their feed."; + $output = t("This allows you to see and change an news item's \"tag\". All articles are originally tagged with the \"Attributes\" of their feed."); break; } - return t($output); + return $output; } function import_system($field){ @@ -87,8 +97,8 @@ function import_system($field){ function import_settings() { $number = array(5 => 5, 10 => 10, 15 => 15, 20 => 20, 25 => 25, 30 => 30, 35 => 35, 40 => 40, 45 => 45, 50 => 50, 55 => 55, 60 => 60, 65 => 65, 70 => 70, 75 => 75, 80 => 80, 85 => 85, 90 => 90, 95 => 95, 100 => 100); - $output .= form_select("Items per block", "import_block_limit", variable_get("import_block_limit", 15), $number, "The maximum number of news items displayed in one block."); - $output .= form_select("Items per page", "import_page_limit", variable_get("import_page_limit", 75), $number, "The maximum number of news items displayed on one page."); + $output .= form_select(t("Items per block"), "import_block_limit", variable_get("import_block_limit", 15), $number, t("The maximum number of news items displayed in one block.")); + $output .= form_select(t("Items per page"), "import_page_limit", variable_get("import_page_limit", 75), $number, t("The maximum number of news items displayed on one page.")); return $output; } @@ -441,13 +451,13 @@ function import_save_item($edit) { function import_form_bundle($edit = array()) { - $form .= form_textfield("Title", "title", $edit["title"], 50, 64, "The name of the bundle."); - $form .= form_textfield("Attributes", "attributes", $edit["attributes"], 50, 128, "A comma-separated list of keywords describing the bundle."); + $form .= form_textfield(t("Title"), "title", $edit["title"], 50, 64, t("The name of the bundle.")); + $form .= form_textfield(t("Attributes"), "attributes", $edit["attributes"], 50, 128, t("A comma-separated list of keywords describing the bundle.")); - $form .= form_submit("Submit"); + $form .= form_submit(t("Submit")); if ($edit["bid"]) { - $form .= form_submit("Delete"); + $form .= form_submit(t("Delete")); $form .= form_hidden("bid", $edit["bid"]); } @@ -476,15 +486,15 @@ function import_form_feed($edit = array()) { $edit["refresh"] = 3600; } - $form .= form_textfield("Title", "title", $edit["title"], 50, 64, "The name of the feed; typically the name of the web site you syndicate content from."); - $form .= form_textfield("Url", "url", $edit["url"], 50, 128, "The fully-qualified URL of the feed."); - $form .= form_textfield("Attributes", "attributes", $edit["attributes"], 50, 128, "A comma-separated list of keywords describing the feed."); - $form .= form_select("Update interval", "refresh", $edit["refresh"], $period, "The refresh interval indicating how often you want to update this feed. Requires crontab."); + $form .= form_textfield(t("Title"), "title", $edit["title"], 50, 64, t("The name of the feed; typically the name of the web site you syndicate content from.")); + $form .= form_textfield(t("URL"), "url", $edit["url"], 50, 128, t("The fully-qualified URL of the feed.")); + $form .= form_textfield(t("Attributes"), "attributes", $edit["attributes"], 50, 128, t("A comma-separated list of keywords describing the feed.")); + $form .= form_select(t("Update interval"), "refresh", $edit["refresh"], $period, t("The refresh interval indicating how often you want to update this feed. Requires crontab.")); - $form .= form_submit("Submit"); + $form .= form_submit(t("Submit")); if ($edit["fid"]) { - $form .= form_submit("Delete"); + $form .= form_submit(t("Delete")); $form .= form_hidden("fid", $edit["fid"]); } @@ -511,7 +521,7 @@ function import_save_attributes($edit) { foreach ($edit as $iid => $value) { db_query("UPDATE {item} SET attributes = '%s' WHERE iid = %d", $value, $iid); } - return "attributes has been saved"; + return t("attributes has been saved"); } function import_get_feed($fid) { @@ -525,7 +535,7 @@ function import_get_bundle($bid) { function import_view() { $result = db_query("SELECT f.*, COUNT(i.iid) AS items FROM {feed} f LEFT JOIN {item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.url, f.refresh, f.timestamp, f.attributes, f.link, f.description ORDER BY f.title"); - $output .= "<h3>Feed overview</h3>"; + $output .= "<h3>". t("Feed overview"). "</h3>"; $header = array(t("title"), t("attributes"), t("items"), t("last update"), t("next update"), array("data" => t("operations"), "colspan" => 3)); unset($rows); @@ -536,7 +546,7 @@ function import_view() { $result = db_query("SELECT * FROM {bundle} ORDER BY title"); - $output .= "<h3>Bundle overview</h3>"; + $output .= "<h3>". t("Bundle overview"). "</h3>"; $header = array(t("title"), t("attributes"), t("operations")); unset($rows); @@ -558,7 +568,7 @@ function import_tag() { } $output .= table($header, $rows); - $output .= "<input type=\"submit\" name=\"op\" value=\"Save attributes\" />\n"; + $output .= "<input type=\"submit\" name=\"op\" value=\"" . t("Save attributes") . "\" />\n"; return form($output); } @@ -584,31 +594,31 @@ function import_admin() { break; case "edit": if (arg(5) == "bundle") { - $output = import_form_bundle(import_get_bundle(arg(5))); + $output = import_form_bundle(import_get_bundle(arg(6))); } else { - $output = import_form_feed(import_get_feed(arg(5))); + $output = import_form_feed(import_get_feed(arg(6))); } break; case "remove": - $output = status(import_remove(import_get_feed(arg(4)))); + $output = status(import_remove(import_get_feed(arg(5)))); $output .= import_view(); break; case "update": - $output = status(import_refresh(import_get_feed(arg(4)))); + $output = status(import_refresh(import_get_feed(arg(5)))); $output .= import_view(); break; case "tag": $output = import_tag(); break; - case "Save attributes": + case t("Save attributes"): $output = status(import_save_attributes($edit)); $output .= import_tag(); break; - case "Delete": + case t("Delete"): $edit["title"] = 0; // fall through: - case "Submit": + case t("Submit"): if (arg(5) == "bundle") { $output = status(import_save_bundle($edit)); } diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index f752904ba..8d47d238f 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -8,25 +8,24 @@ function import_help($section = "admin/import/help") { switch ($section) { case 'admin/help': case 'admin/import/help': - $output .= strtr("<p>Thousands of web sites, especially news sites and weblogs, syndicate their most recent site content for others to display. The syndicated content always includes titles, also known as headlines, for the newest published stories. Each headline acts as a direct link to the stories on the remote site. Along with the headline, most sites typically provide either the first few paragraphs of the story or a short summary. Many individuals use client-based news aggregators on their personal computer to aggregate content, such as %amphetadesk</p>", array("%amphetadesk" => "<a href=\"http://www.disobey.com/amphetadesk/\">". t("AmphetaDesk") ."</a>")); - + $output .= "<p>Thousands of web sites, especially news sites and weblogs, syndicate their most recent site content for others to display. The syndicated content always includes titles, also known as headlines, for the newest published stories. Each headline acts as a direct link to the stories on the remote site. Along with the headline, most sites typically provide either the first few paragraphs of the story or a short summary. Many individuals use client-based news aggregators on their personal computer to aggregate content, such as %amphetadesk</p>"; $output .= "<p>Drupal also has a news aggregator built in as a standard feature. With it, you can subscribe to feeds from other sites and display their content for your site users. Simply enable the import module in site administration and enter the feeds that you choose.</p>"; $output .= "<h3>What do I need to subscribe to a feed?</h3>"; - $output .= strtr("<p>The standard method of syndication is using the XML-based %rss (RSS). To syndicate a site's content, obtain the full URL of the RSS page providing syndication. Common file tags for RSS pages are .rss, .xml and .rdf. Example: %slashdot-rss.</p>", array("%rss" => "<a href=\"http://groups.yahoo.com/group/rss-dev/files/specification.html\">". t("Rich Site Summary") ."</a>", "%slashdot-rss" => "<a href=\"http://slashdot.org/slashdot.rdf\">". t("http://slashdot.org/slashdot.rfd") ."</a>")); + $output .= "<p>The standard method of syndication is using the XML-based %rss (RSS). To syndicate a site's content, obtain the full URL of the RSS page providing syndication. Common file tags for RSS pages are .rss, .xml and .rdf. Example: %slashdot-rss.</p>"; $output .= "<p>Most weblog sites that offer syndication will have an obvious link on the main page. Often you need only look for an xml syndication button, such as the one Drupal uses for site syndication.</p>"; - $output .= strtr("<p>But some sites do not make their RSS feeds as easy to find. Or maybe you want to find a number of feeds on a given topic, without extensively searching the web. In that case, try an RSS syndication directory such as %syndic8.</p>", array("%syndic8" => "<a href=\"http://www.syndic8.com/\">". t("Syndic8") ."</a>")); - $output .= strtr("<p>To learn much more about RSS, read Mark Pilgrim's %rss-what and WebReference.com's %rss-evolution.</p>", array("%rss-what" => "<a href=\"http://www.xml.com/pub/a/2002/12/18/dive-into-xml.html\">". t("What is RSS") ."</a>", "%rss-evolution" => "<a href=\"http://www.webreference.com/authoring/languages/xml/rss/1/\">". t("The Evolution of RSS") ."</a>")); + $output .= "<p>But some sites do not make their RSS feeds as easy to find. Or maybe you want to find a number of feeds on a given topic, without extensively searching the web. In that case, try an RSS syndication directory such as %syndic8.</p>"; + $output .= "<p>To learn much more about RSS, read Mark Pilgrim's %rss-what and WebReference.com's %rss-evolution.</p>"; $output .= "<p>NOTE: Enable your site's xml syndication button by turning on the Syndicate block in block management.</p>"; $output .= "<h3>Configuring news feeds</h3>"; - $output .= strtr("<p>To subscribe to an RSS feed on another site, use the %admin-news shortcut at the top of the news aggregation page. The link leads directly to the news aggregation configuration section of Drupal site administration.</p>", array("%admin-news" => l(t("administer news feeds"), "admin/node/syndication/news"))); - $output .= strtr("<p>Once there, select %new-feed from the left hand menu. Drupal will then ask for the following:</p>", array("%new-feed" => l(t("add new feed"), "admin/node/syndication/news/add/feed") )); + $output .= "<p>To subscribe to an RSS feed on another site, use the %admin-news shortcut at the top of the news aggregation page. The link leads directly to the news aggregation configuration section of Drupal site administration.</p>"; + $output .= "<p>Once there, select %new-feed from the left hand menu. Drupal will then ask for the following:</p>"; $output .= "<ul>"; $output .= "<li><b>Title</b> -- The text entered here will be used in your news aggregator, within the administration configuration section, and as title for the news feed block. As a general rule, use the web site name from which the feed originates.</li>"; $output .= " <li><b>URL</b> -- Here you'll enter the fully-qualified URL for the feed for the site you want to subscribe to.</li>"; $output .= "<li><b>Attributes</b> -- Attributes are keywords which can be used to collect feeds into <i>bundles</i> (see below). Think of these as the means of classifying your feeds. Separate multiple attributes with commas. If you do not plan on using the specific feed in a bundle, this input field can be left blank.</li>"; - $output .= strtr("<li><b>Update interval</b> -- The update interval is how often Drupal will automatically access the RSS URL for the site for fresh content. The 1 hour default is typically the minimum you will want to use. Accessing another site's RSS page more frequently can be considered impolite. After all, it does require the other site's server handle your requests. To use this feature cron.php must be called regularly, otherwise, you'll have to manually update feeds one at a time within the news aggregation administration section by using %update-items.</li>", array("%update-items" => l(t("update items"), "admin/node/syndication/news") )); + $output .= "<li><b>Update interval</b> -- The update interval is how often Drupal will automatically access the RSS URL for the site for fresh content. The 1 hour default is typically the minimum you will want to use. Accessing another site's RSS page more frequently can be considered impolite. After all, it does require the other site's server handle your requests. To use this feature cron.php must be called regularly, otherwise, you'll have to manually update feeds one at a time within the news aggregation administration section by using %update-items.</li>"; $output .= "</ul>"; - $output .= strtr("<p>Once you submit your new feed, check to see if it is working properly. Select %update-items on the %main-aggregation page. If you do not see any items listed for that feed, edit the feed and make sure that the URL was entered correctly.</p>", array("%update-items" => l(t("update items"), "admin/node/syndication/news"), "%main-aggregation" => l(t("main news aggregation"), "admin/node/syndication/news") )); + $output .= "<p>Once you submit your new feed, check to see if it is working properly. Select %update-items on the %admin-news page. If you do not see any items listed for that feed, edit the feed and make sure that the URL was entered correctly.</p>"; $output .= "<h3>Adding bundles</h3>"; $output .= "<p>You may want to follow some feeds more closely than others. Or perhaps you'd like to display a select list of the titles for some feeds as a block for users. Bundles are a way of grouping your feeds into categories. Bundles look for feeds that contain at least one of the keywords, or attributes, associated with the bundle and display those feeds together.</p>"; $output .= "<p>When adding a bundle, Drupal will ask for:</p>"; @@ -52,28 +51,39 @@ function import_help($section = "admin/import/help") { $output .= "</ul>"; $output .= "<h3>RSS feed blocks</h3>"; $output .= "<p>In addition to providing subscribed content through the news aggregator, Drupal automatically creates a block for each subscribed feed and every bundle created. Beside each headline in each block, Drupal includes an icon which acts a blog it link. Enable any or all of the blocks using block management.</p>"; + $output = t($output, array( + "%amphetadesk" => "<a href=\"http://www.disobey.com/amphetadesk/\">AmphetaDesk</a>", + "%rss" => "<a href=\"http://groups.yahoo.com/group/rss-dev/files/specification.html\">Rich Site Summary</a>", + "%slashdot-rss" => "<a href=\"http://slashdot.org/slashdot.rdf\">http://slashdot.org/slashdot.rfd</a>", + "%syndic8" => "<a href=\"http://www.syndic8.com/\">Syndic8</a>", + "%rss-what" => "<a href=\"http://www.xml.com/pub/a/2002/12/18/dive-into-xml.html\">What is RSS</a>", + "%rss-evolution" => "<a href=\"http://www.webreference.com/authoring/languages/xml/rss/1/\">The Evolution of RSS</a>", + "%admin-news" => l(t("RSS/RDF"), "admin/node/syndication/news"), + "%new-feed" => l(t("new feed"), "admin/node/syndication/news/add/feed"), + "%update-items" => l(t("update items"), "admin/node/syndication/news"), + )); break; case 'admin/system/modules': - $output = "Used to aggregate syndicated content (RSS and RDF)."; + $output = t("Used to aggregate syndicated content (RSS and RDF)."); break; case 'admin/system/modules/import': - $output = "Drupal's news aggregator controls how many RSS/RDF items from a single source are displayed in a \"Block\", and on the page that goes with that block."; + $output = t("Drupal's news aggregator controls how many RSS/RDF items from a single source are displayed in a \"Block\", and on the page that goes with that block."); break; case 'admin/node/syndication/news': - $output = strtr("Several web sites, especially news related sites, syndicate parts of their site's content for other web sites to display. Usually, the syndicated content includes the latest headlines with a direct link to that story on the remote site. Some syndicated content also includes a description of the headline. The standard method of syndication is using the XML based Rich Site Summary (RSS). To get a feed to work you <b>must</b> run \"cron.php\". To display the feed in a block you must turn on the %block. <br /><ul><li>To delete a feed choose \"edit feed\"</li><li>To clear all of the entries from a feed choose \"Remove items\"</li><li>To check whether a feed is working, and to get new items <b>now</b> click on \"update items\"</li></ul><ul><li>To delete a bundle choose \"edit bundle\".</li></ul>", array("%block" => l(t("feed's block"), "admin/block") )); + $output = t("Several web sites, especially news related sites, syndicate parts of their site's content for other web sites to display. Usually, the syndicated content includes the latest headlines with a direct link to that story on the remote site. Some syndicated content also includes a description of the headline. The standard method of syndication is using the XML based Rich Site Summary (RSS). To get a feed to work you <b>must</b> run \"cron.php\". To display the feed in a block you must turn on the %block. <br /><ul><li>To delete a feed choose \"edit feed\"</li><li>To clear all of the entries from a feed choose \"Remove items\"</li><li>To check whether a feed is working, and to get new items <b>now</b> click on \"update items\"</li></ul><ul><li>To delete a bundle choose \"edit bundle\".</li></ul>", array("%block" => l(t("feed's block"), "admin/system/block") )); break; case 'admin/node/syndication/news/add/feed': - $output = strtr("Add a site that has an RSS/RDF feed. The URL is the full path to the RSS feed file. For the feed to update automatically you must run \"cron.php\". The \"Attributes\" are used to bundle this feed with other feeds (See %bundle), and to tag articles from this feed.<br />Note: If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.", array("%bundle" => l(t("add new bundle"), "admin/node/syndication/news/add/bundle") )); + $output = t("Add a site that has an RSS/RDF feed. The URL is the full path to the RSS feed file. For the feed to update automatically you must run \"cron.php\". The \"Attributes\" are used to bundle this feed with other feeds (See %bundle), and to tag articles from this feed.<br />Note: If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.", array("%bundle" => l(t("add new bundle"), "admin/node/syndication/news/add/bundle") )); break; case 'admin/node/syndication/news/add/bundle': - $output = strtr("Bundles provide a generalized way of creating composite feeds. They allow you, for example, to combine various sport-related feeds into one bundle called <i>Sport</i>. If an article from a feed has been \"tag\"-ged (See %tag too look at and change tags.) with a matching \"Attribute\" then it will be added to the bundle.", array("%tag" => l(t("tag news item"), "admin/node/syndication/news/tag") )); + $output = t("Bundles provide a generalized way of creating composite feeds. They allow you, for example, to combine various sport-related feeds into one bundle called <i>Sport</i>. If an article from a feed has been \"tag\"-ged (See %tag too look at and change tags.) with a matching \"Attribute\" then it will be added to the bundle.", array("%tag" => l(t("tag news item"), "admin/node/syndication/news/tag") )); break; case 'admin/node/syndication/news/tag': - $output = "This allows you to see and change an news item's \"tag\". All articles are originally tagged with the \"Attributes\" of their feed."; + $output = t("This allows you to see and change an news item's \"tag\". All articles are originally tagged with the \"Attributes\" of their feed."); break; } - return t($output); + return $output; } function import_system($field){ @@ -87,8 +97,8 @@ function import_system($field){ function import_settings() { $number = array(5 => 5, 10 => 10, 15 => 15, 20 => 20, 25 => 25, 30 => 30, 35 => 35, 40 => 40, 45 => 45, 50 => 50, 55 => 55, 60 => 60, 65 => 65, 70 => 70, 75 => 75, 80 => 80, 85 => 85, 90 => 90, 95 => 95, 100 => 100); - $output .= form_select("Items per block", "import_block_limit", variable_get("import_block_limit", 15), $number, "The maximum number of news items displayed in one block."); - $output .= form_select("Items per page", "import_page_limit", variable_get("import_page_limit", 75), $number, "The maximum number of news items displayed on one page."); + $output .= form_select(t("Items per block"), "import_block_limit", variable_get("import_block_limit", 15), $number, t("The maximum number of news items displayed in one block.")); + $output .= form_select(t("Items per page"), "import_page_limit", variable_get("import_page_limit", 75), $number, t("The maximum number of news items displayed on one page.")); return $output; } @@ -441,13 +451,13 @@ function import_save_item($edit) { function import_form_bundle($edit = array()) { - $form .= form_textfield("Title", "title", $edit["title"], 50, 64, "The name of the bundle."); - $form .= form_textfield("Attributes", "attributes", $edit["attributes"], 50, 128, "A comma-separated list of keywords describing the bundle."); + $form .= form_textfield(t("Title"), "title", $edit["title"], 50, 64, t("The name of the bundle.")); + $form .= form_textfield(t("Attributes"), "attributes", $edit["attributes"], 50, 128, t("A comma-separated list of keywords describing the bundle.")); - $form .= form_submit("Submit"); + $form .= form_submit(t("Submit")); if ($edit["bid"]) { - $form .= form_submit("Delete"); + $form .= form_submit(t("Delete")); $form .= form_hidden("bid", $edit["bid"]); } @@ -476,15 +486,15 @@ function import_form_feed($edit = array()) { $edit["refresh"] = 3600; } - $form .= form_textfield("Title", "title", $edit["title"], 50, 64, "The name of the feed; typically the name of the web site you syndicate content from."); - $form .= form_textfield("Url", "url", $edit["url"], 50, 128, "The fully-qualified URL of the feed."); - $form .= form_textfield("Attributes", "attributes", $edit["attributes"], 50, 128, "A comma-separated list of keywords describing the feed."); - $form .= form_select("Update interval", "refresh", $edit["refresh"], $period, "The refresh interval indicating how often you want to update this feed. Requires crontab."); + $form .= form_textfield(t("Title"), "title", $edit["title"], 50, 64, t("The name of the feed; typically the name of the web site you syndicate content from.")); + $form .= form_textfield(t("URL"), "url", $edit["url"], 50, 128, t("The fully-qualified URL of the feed.")); + $form .= form_textfield(t("Attributes"), "attributes", $edit["attributes"], 50, 128, t("A comma-separated list of keywords describing the feed.")); + $form .= form_select(t("Update interval"), "refresh", $edit["refresh"], $period, t("The refresh interval indicating how often you want to update this feed. Requires crontab.")); - $form .= form_submit("Submit"); + $form .= form_submit(t("Submit")); if ($edit["fid"]) { - $form .= form_submit("Delete"); + $form .= form_submit(t("Delete")); $form .= form_hidden("fid", $edit["fid"]); } @@ -511,7 +521,7 @@ function import_save_attributes($edit) { foreach ($edit as $iid => $value) { db_query("UPDATE {item} SET attributes = '%s' WHERE iid = %d", $value, $iid); } - return "attributes has been saved"; + return t("attributes has been saved"); } function import_get_feed($fid) { @@ -525,7 +535,7 @@ function import_get_bundle($bid) { function import_view() { $result = db_query("SELECT f.*, COUNT(i.iid) AS items FROM {feed} f LEFT JOIN {item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.url, f.refresh, f.timestamp, f.attributes, f.link, f.description ORDER BY f.title"); - $output .= "<h3>Feed overview</h3>"; + $output .= "<h3>". t("Feed overview"). "</h3>"; $header = array(t("title"), t("attributes"), t("items"), t("last update"), t("next update"), array("data" => t("operations"), "colspan" => 3)); unset($rows); @@ -536,7 +546,7 @@ function import_view() { $result = db_query("SELECT * FROM {bundle} ORDER BY title"); - $output .= "<h3>Bundle overview</h3>"; + $output .= "<h3>". t("Bundle overview"). "</h3>"; $header = array(t("title"), t("attributes"), t("operations")); unset($rows); @@ -558,7 +568,7 @@ function import_tag() { } $output .= table($header, $rows); - $output .= "<input type=\"submit\" name=\"op\" value=\"Save attributes\" />\n"; + $output .= "<input type=\"submit\" name=\"op\" value=\"" . t("Save attributes") . "\" />\n"; return form($output); } @@ -584,31 +594,31 @@ function import_admin() { break; case "edit": if (arg(5) == "bundle") { - $output = import_form_bundle(import_get_bundle(arg(5))); + $output = import_form_bundle(import_get_bundle(arg(6))); } else { - $output = import_form_feed(import_get_feed(arg(5))); + $output = import_form_feed(import_get_feed(arg(6))); } break; case "remove": - $output = status(import_remove(import_get_feed(arg(4)))); + $output = status(import_remove(import_get_feed(arg(5)))); $output .= import_view(); break; case "update": - $output = status(import_refresh(import_get_feed(arg(4)))); + $output = status(import_refresh(import_get_feed(arg(5)))); $output .= import_view(); break; case "tag": $output = import_tag(); break; - case "Save attributes": + case t("Save attributes"): $output = status(import_save_attributes($edit)); $output .= import_tag(); break; - case "Delete": + case t("Delete"): $edit["title"] = 0; // fall through: - case "Submit": + case t("Submit"): if (arg(5) == "bundle") { $output = status(import_save_bundle($edit)); } diff --git a/modules/import.module b/modules/import.module index f752904ba..8d47d238f 100644 --- a/modules/import.module +++ b/modules/import.module @@ -8,25 +8,24 @@ function import_help($section = "admin/import/help") { switch ($section) { case 'admin/help': case 'admin/import/help': - $output .= strtr("<p>Thousands of web sites, especially news sites and weblogs, syndicate their most recent site content for others to display. The syndicated content always includes titles, also known as headlines, for the newest published stories. Each headline acts as a direct link to the stories on the remote site. Along with the headline, most sites typically provide either the first few paragraphs of the story or a short summary. Many individuals use client-based news aggregators on their personal computer to aggregate content, such as %amphetadesk</p>", array("%amphetadesk" => "<a href=\"http://www.disobey.com/amphetadesk/\">". t("AmphetaDesk") ."</a>")); - + $output .= "<p>Thousands of web sites, especially news sites and weblogs, syndicate their most recent site content for others to display. The syndicated content always includes titles, also known as headlines, for the newest published stories. Each headline acts as a direct link to the stories on the remote site. Along with the headline, most sites typically provide either the first few paragraphs of the story or a short summary. Many individuals use client-based news aggregators on their personal computer to aggregate content, such as %amphetadesk</p>"; $output .= "<p>Drupal also has a news aggregator built in as a standard feature. With it, you can subscribe to feeds from other sites and display their content for your site users. Simply enable the import module in site administration and enter the feeds that you choose.</p>"; $output .= "<h3>What do I need to subscribe to a feed?</h3>"; - $output .= strtr("<p>The standard method of syndication is using the XML-based %rss (RSS). To syndicate a site's content, obtain the full URL of the RSS page providing syndication. Common file tags for RSS pages are .rss, .xml and .rdf. Example: %slashdot-rss.</p>", array("%rss" => "<a href=\"http://groups.yahoo.com/group/rss-dev/files/specification.html\">". t("Rich Site Summary") ."</a>", "%slashdot-rss" => "<a href=\"http://slashdot.org/slashdot.rdf\">". t("http://slashdot.org/slashdot.rfd") ."</a>")); + $output .= "<p>The standard method of syndication is using the XML-based %rss (RSS). To syndicate a site's content, obtain the full URL of the RSS page providing syndication. Common file tags for RSS pages are .rss, .xml and .rdf. Example: %slashdot-rss.</p>"; $output .= "<p>Most weblog sites that offer syndication will have an obvious link on the main page. Often you need only look for an xml syndication button, such as the one Drupal uses for site syndication.</p>"; - $output .= strtr("<p>But some sites do not make their RSS feeds as easy to find. Or maybe you want to find a number of feeds on a given topic, without extensively searching the web. In that case, try an RSS syndication directory such as %syndic8.</p>", array("%syndic8" => "<a href=\"http://www.syndic8.com/\">". t("Syndic8") ."</a>")); - $output .= strtr("<p>To learn much more about RSS, read Mark Pilgrim's %rss-what and WebReference.com's %rss-evolution.</p>", array("%rss-what" => "<a href=\"http://www.xml.com/pub/a/2002/12/18/dive-into-xml.html\">". t("What is RSS") ."</a>", "%rss-evolution" => "<a href=\"http://www.webreference.com/authoring/languages/xml/rss/1/\">". t("The Evolution of RSS") ."</a>")); + $output .= "<p>But some sites do not make their RSS feeds as easy to find. Or maybe you want to find a number of feeds on a given topic, without extensively searching the web. In that case, try an RSS syndication directory such as %syndic8.</p>"; + $output .= "<p>To learn much more about RSS, read Mark Pilgrim's %rss-what and WebReference.com's %rss-evolution.</p>"; $output .= "<p>NOTE: Enable your site's xml syndication button by turning on the Syndicate block in block management.</p>"; $output .= "<h3>Configuring news feeds</h3>"; - $output .= strtr("<p>To subscribe to an RSS feed on another site, use the %admin-news shortcut at the top of the news aggregation page. The link leads directly to the news aggregation configuration section of Drupal site administration.</p>", array("%admin-news" => l(t("administer news feeds"), "admin/node/syndication/news"))); - $output .= strtr("<p>Once there, select %new-feed from the left hand menu. Drupal will then ask for the following:</p>", array("%new-feed" => l(t("add new feed"), "admin/node/syndication/news/add/feed") )); + $output .= "<p>To subscribe to an RSS feed on another site, use the %admin-news shortcut at the top of the news aggregation page. The link leads directly to the news aggregation configuration section of Drupal site administration.</p>"; + $output .= "<p>Once there, select %new-feed from the left hand menu. Drupal will then ask for the following:</p>"; $output .= "<ul>"; $output .= "<li><b>Title</b> -- The text entered here will be used in your news aggregator, within the administration configuration section, and as title for the news feed block. As a general rule, use the web site name from which the feed originates.</li>"; $output .= " <li><b>URL</b> -- Here you'll enter the fully-qualified URL for the feed for the site you want to subscribe to.</li>"; $output .= "<li><b>Attributes</b> -- Attributes are keywords which can be used to collect feeds into <i>bundles</i> (see below). Think of these as the means of classifying your feeds. Separate multiple attributes with commas. If you do not plan on using the specific feed in a bundle, this input field can be left blank.</li>"; - $output .= strtr("<li><b>Update interval</b> -- The update interval is how often Drupal will automatically access the RSS URL for the site for fresh content. The 1 hour default is typically the minimum you will want to use. Accessing another site's RSS page more frequently can be considered impolite. After all, it does require the other site's server handle your requests. To use this feature cron.php must be called regularly, otherwise, you'll have to manually update feeds one at a time within the news aggregation administration section by using %update-items.</li>", array("%update-items" => l(t("update items"), "admin/node/syndication/news") )); + $output .= "<li><b>Update interval</b> -- The update interval is how often Drupal will automatically access the RSS URL for the site for fresh content. The 1 hour default is typically the minimum you will want to use. Accessing another site's RSS page more frequently can be considered impolite. After all, it does require the other site's server handle your requests. To use this feature cron.php must be called regularly, otherwise, you'll have to manually update feeds one at a time within the news aggregation administration section by using %update-items.</li>"; $output .= "</ul>"; - $output .= strtr("<p>Once you submit your new feed, check to see if it is working properly. Select %update-items on the %main-aggregation page. If you do not see any items listed for that feed, edit the feed and make sure that the URL was entered correctly.</p>", array("%update-items" => l(t("update items"), "admin/node/syndication/news"), "%main-aggregation" => l(t("main news aggregation"), "admin/node/syndication/news") )); + $output .= "<p>Once you submit your new feed, check to see if it is working properly. Select %update-items on the %admin-news page. If you do not see any items listed for that feed, edit the feed and make sure that the URL was entered correctly.</p>"; $output .= "<h3>Adding bundles</h3>"; $output .= "<p>You may want to follow some feeds more closely than others. Or perhaps you'd like to display a select list of the titles for some feeds as a block for users. Bundles are a way of grouping your feeds into categories. Bundles look for feeds that contain at least one of the keywords, or attributes, associated with the bundle and display those feeds together.</p>"; $output .= "<p>When adding a bundle, Drupal will ask for:</p>"; @@ -52,28 +51,39 @@ function import_help($section = "admin/import/help") { $output .= "</ul>"; $output .= "<h3>RSS feed blocks</h3>"; $output .= "<p>In addition to providing subscribed content through the news aggregator, Drupal automatically creates a block for each subscribed feed and every bundle created. Beside each headline in each block, Drupal includes an icon which acts a blog it link. Enable any or all of the blocks using block management.</p>"; + $output = t($output, array( + "%amphetadesk" => "<a href=\"http://www.disobey.com/amphetadesk/\">AmphetaDesk</a>", + "%rss" => "<a href=\"http://groups.yahoo.com/group/rss-dev/files/specification.html\">Rich Site Summary</a>", + "%slashdot-rss" => "<a href=\"http://slashdot.org/slashdot.rdf\">http://slashdot.org/slashdot.rfd</a>", + "%syndic8" => "<a href=\"http://www.syndic8.com/\">Syndic8</a>", + "%rss-what" => "<a href=\"http://www.xml.com/pub/a/2002/12/18/dive-into-xml.html\">What is RSS</a>", + "%rss-evolution" => "<a href=\"http://www.webreference.com/authoring/languages/xml/rss/1/\">The Evolution of RSS</a>", + "%admin-news" => l(t("RSS/RDF"), "admin/node/syndication/news"), + "%new-feed" => l(t("new feed"), "admin/node/syndication/news/add/feed"), + "%update-items" => l(t("update items"), "admin/node/syndication/news"), + )); break; case 'admin/system/modules': - $output = "Used to aggregate syndicated content (RSS and RDF)."; + $output = t("Used to aggregate syndicated content (RSS and RDF)."); break; case 'admin/system/modules/import': - $output = "Drupal's news aggregator controls how many RSS/RDF items from a single source are displayed in a \"Block\", and on the page that goes with that block."; + $output = t("Drupal's news aggregator controls how many RSS/RDF items from a single source are displayed in a \"Block\", and on the page that goes with that block."); break; case 'admin/node/syndication/news': - $output = strtr("Several web sites, especially news related sites, syndicate parts of their site's content for other web sites to display. Usually, the syndicated content includes the latest headlines with a direct link to that story on the remote site. Some syndicated content also includes a description of the headline. The standard method of syndication is using the XML based Rich Site Summary (RSS). To get a feed to work you <b>must</b> run \"cron.php\". To display the feed in a block you must turn on the %block. <br /><ul><li>To delete a feed choose \"edit feed\"</li><li>To clear all of the entries from a feed choose \"Remove items\"</li><li>To check whether a feed is working, and to get new items <b>now</b> click on \"update items\"</li></ul><ul><li>To delete a bundle choose \"edit bundle\".</li></ul>", array("%block" => l(t("feed's block"), "admin/block") )); + $output = t("Several web sites, especially news related sites, syndicate parts of their site's content for other web sites to display. Usually, the syndicated content includes the latest headlines with a direct link to that story on the remote site. Some syndicated content also includes a description of the headline. The standard method of syndication is using the XML based Rich Site Summary (RSS). To get a feed to work you <b>must</b> run \"cron.php\". To display the feed in a block you must turn on the %block. <br /><ul><li>To delete a feed choose \"edit feed\"</li><li>To clear all of the entries from a feed choose \"Remove items\"</li><li>To check whether a feed is working, and to get new items <b>now</b> click on \"update items\"</li></ul><ul><li>To delete a bundle choose \"edit bundle\".</li></ul>", array("%block" => l(t("feed's block"), "admin/system/block") )); break; case 'admin/node/syndication/news/add/feed': - $output = strtr("Add a site that has an RSS/RDF feed. The URL is the full path to the RSS feed file. For the feed to update automatically you must run \"cron.php\". The \"Attributes\" are used to bundle this feed with other feeds (See %bundle), and to tag articles from this feed.<br />Note: If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.", array("%bundle" => l(t("add new bundle"), "admin/node/syndication/news/add/bundle") )); + $output = t("Add a site that has an RSS/RDF feed. The URL is the full path to the RSS feed file. For the feed to update automatically you must run \"cron.php\". The \"Attributes\" are used to bundle this feed with other feeds (See %bundle), and to tag articles from this feed.<br />Note: If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.", array("%bundle" => l(t("add new bundle"), "admin/node/syndication/news/add/bundle") )); break; case 'admin/node/syndication/news/add/bundle': - $output = strtr("Bundles provide a generalized way of creating composite feeds. They allow you, for example, to combine various sport-related feeds into one bundle called <i>Sport</i>. If an article from a feed has been \"tag\"-ged (See %tag too look at and change tags.) with a matching \"Attribute\" then it will be added to the bundle.", array("%tag" => l(t("tag news item"), "admin/node/syndication/news/tag") )); + $output = t("Bundles provide a generalized way of creating composite feeds. They allow you, for example, to combine various sport-related feeds into one bundle called <i>Sport</i>. If an article from a feed has been \"tag\"-ged (See %tag too look at and change tags.) with a matching \"Attribute\" then it will be added to the bundle.", array("%tag" => l(t("tag news item"), "admin/node/syndication/news/tag") )); break; case 'admin/node/syndication/news/tag': - $output = "This allows you to see and change an news item's \"tag\". All articles are originally tagged with the \"Attributes\" of their feed."; + $output = t("This allows you to see and change an news item's \"tag\". All articles are originally tagged with the \"Attributes\" of their feed."); break; } - return t($output); + return $output; } function import_system($field){ @@ -87,8 +97,8 @@ function import_system($field){ function import_settings() { $number = array(5 => 5, 10 => 10, 15 => 15, 20 => 20, 25 => 25, 30 => 30, 35 => 35, 40 => 40, 45 => 45, 50 => 50, 55 => 55, 60 => 60, 65 => 65, 70 => 70, 75 => 75, 80 => 80, 85 => 85, 90 => 90, 95 => 95, 100 => 100); - $output .= form_select("Items per block", "import_block_limit", variable_get("import_block_limit", 15), $number, "The maximum number of news items displayed in one block."); - $output .= form_select("Items per page", "import_page_limit", variable_get("import_page_limit", 75), $number, "The maximum number of news items displayed on one page."); + $output .= form_select(t("Items per block"), "import_block_limit", variable_get("import_block_limit", 15), $number, t("The maximum number of news items displayed in one block.")); + $output .= form_select(t("Items per page"), "import_page_limit", variable_get("import_page_limit", 75), $number, t("The maximum number of news items displayed on one page.")); return $output; } @@ -441,13 +451,13 @@ function import_save_item($edit) { function import_form_bundle($edit = array()) { - $form .= form_textfield("Title", "title", $edit["title"], 50, 64, "The name of the bundle."); - $form .= form_textfield("Attributes", "attributes", $edit["attributes"], 50, 128, "A comma-separated list of keywords describing the bundle."); + $form .= form_textfield(t("Title"), "title", $edit["title"], 50, 64, t("The name of the bundle.")); + $form .= form_textfield(t("Attributes"), "attributes", $edit["attributes"], 50, 128, t("A comma-separated list of keywords describing the bundle.")); - $form .= form_submit("Submit"); + $form .= form_submit(t("Submit")); if ($edit["bid"]) { - $form .= form_submit("Delete"); + $form .= form_submit(t("Delete")); $form .= form_hidden("bid", $edit["bid"]); } @@ -476,15 +486,15 @@ function import_form_feed($edit = array()) { $edit["refresh"] = 3600; } - $form .= form_textfield("Title", "title", $edit["title"], 50, 64, "The name of the feed; typically the name of the web site you syndicate content from."); - $form .= form_textfield("Url", "url", $edit["url"], 50, 128, "The fully-qualified URL of the feed."); - $form .= form_textfield("Attributes", "attributes", $edit["attributes"], 50, 128, "A comma-separated list of keywords describing the feed."); - $form .= form_select("Update interval", "refresh", $edit["refresh"], $period, "The refresh interval indicating how often you want to update this feed. Requires crontab."); + $form .= form_textfield(t("Title"), "title", $edit["title"], 50, 64, t("The name of the feed; typically the name of the web site you syndicate content from.")); + $form .= form_textfield(t("URL"), "url", $edit["url"], 50, 128, t("The fully-qualified URL of the feed.")); + $form .= form_textfield(t("Attributes"), "attributes", $edit["attributes"], 50, 128, t("A comma-separated list of keywords describing the feed.")); + $form .= form_select(t("Update interval"), "refresh", $edit["refresh"], $period, t("The refresh interval indicating how often you want to update this feed. Requires crontab.")); - $form .= form_submit("Submit"); + $form .= form_submit(t("Submit")); if ($edit["fid"]) { - $form .= form_submit("Delete"); + $form .= form_submit(t("Delete")); $form .= form_hidden("fid", $edit["fid"]); } @@ -511,7 +521,7 @@ function import_save_attributes($edit) { foreach ($edit as $iid => $value) { db_query("UPDATE {item} SET attributes = '%s' WHERE iid = %d", $value, $iid); } - return "attributes has been saved"; + return t("attributes has been saved"); } function import_get_feed($fid) { @@ -525,7 +535,7 @@ function import_get_bundle($bid) { function import_view() { $result = db_query("SELECT f.*, COUNT(i.iid) AS items FROM {feed} f LEFT JOIN {item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.url, f.refresh, f.timestamp, f.attributes, f.link, f.description ORDER BY f.title"); - $output .= "<h3>Feed overview</h3>"; + $output .= "<h3>". t("Feed overview"). "</h3>"; $header = array(t("title"), t("attributes"), t("items"), t("last update"), t("next update"), array("data" => t("operations"), "colspan" => 3)); unset($rows); @@ -536,7 +546,7 @@ function import_view() { $result = db_query("SELECT * FROM {bundle} ORDER BY title"); - $output .= "<h3>Bundle overview</h3>"; + $output .= "<h3>". t("Bundle overview"). "</h3>"; $header = array(t("title"), t("attributes"), t("operations")); unset($rows); @@ -558,7 +568,7 @@ function import_tag() { } $output .= table($header, $rows); - $output .= "<input type=\"submit\" name=\"op\" value=\"Save attributes\" />\n"; + $output .= "<input type=\"submit\" name=\"op\" value=\"" . t("Save attributes") . "\" />\n"; return form($output); } @@ -584,31 +594,31 @@ function import_admin() { break; case "edit": if (arg(5) == "bundle") { - $output = import_form_bundle(import_get_bundle(arg(5))); + $output = import_form_bundle(import_get_bundle(arg(6))); } else { - $output = import_form_feed(import_get_feed(arg(5))); + $output = import_form_feed(import_get_feed(arg(6))); } break; case "remove": - $output = status(import_remove(import_get_feed(arg(4)))); + $output = status(import_remove(import_get_feed(arg(5)))); $output .= import_view(); break; case "update": - $output = status(import_refresh(import_get_feed(arg(4)))); + $output = status(import_refresh(import_get_feed(arg(5)))); $output .= import_view(); break; case "tag": $output = import_tag(); break; - case "Save attributes": + case t("Save attributes"): $output = status(import_save_attributes($edit)); $output .= import_tag(); break; - case "Delete": + case t("Delete"): $edit["title"] = 0; // fall through: - case "Submit": + case t("Submit"): if (arg(5) == "bundle") { $output = status(import_save_bundle($edit)); } |