Changeset 40987

Show
Ignore:
Timestamp:
04/16/08 19:32:00 (3 months ago)
Author:
GamerZ
Message:

Finally have time to fix more 404 problems

Location:
wp-email/trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • wp-email/trunk/readme.html

    r39610 r40987  
    471471                        </li> 
    472472                        <li> 
    473                               Login To WP-Admin, Click <strong>E-Mail</strong> Tab 
    474                         </li> 
    475                         <li> 
    476                               Modify your settings accordingly. If the mail server/type settings are not correct, WP-Email will NOT work. 
    477                         </li> 
    478                         <li> 
    479                               You Need To Re-Generate The Permalink (<strong>WP-Admin -> Options -> Permalinks -> Update Permalink Structure</strong>) 
     473                              Go to '<strong>WP-Admin -> E-Mail -> E-Mail Options</strong>' 
     474                        </li> 
     475                        <li> 
     476                              Under <strong>E-Mail Settings</strong>,  modify the setting <strong>Method Used To Send E-Mail</strong> accordingly. If the method is wrong, no email will get sent. 
     477                        </li> 
     478                        <li> 
     479                              You Need To Re-Generate The Permalink (<strong>WP-Admin -> Settings -> Permalinks -> Save Changes</strong>) 
    480480                        </li> 
    481481                        <li> 
     
    510510                        </li> 
    511511                        <li> 
    512                               Go to '<strong>WP-Admin -> EMail -> EMail Options</strong>' and restore all the template variables to <strong>Default</strong> 
    513                         </li> 
    514                         <li> 
    515                               You Need To Re-Generate The Permalink (<strong>WP-Admin -> Options -> Permalinks -> Update Permalink Structure</strong>) 
     512                              Go to '<strong>WP-Admin -> E-Mail -> E-Mail Options</strong>' and restore all the template variables to <strong>Default</strong> 
     513                        </li> 
     514                        <li> 
     515                              You Need To Re-Generate The Permalink (<strong>WP-Admin -> Settings -> Permalinks -> Save Changes</strong>) 
    516516                        </li> 
    517517                        <li> 
  • wp-email/trunk/wp-email.php

    r39610 r40987  
    6969function email_rewrite($wp_rewrite) { 
    7070      $email_link = get_permalink(); 
    71       $uris = get_option('page_uris'); 
     71      $page_uris = $wp_rewrite->page_uri_index(); 
     72      $uris = $page_uris[0]; 
    7273      if(substr($email_link, -1, 1) != '/' && substr($wp_rewrite->permalink_structure, -1, 1) != '/') { 
    7374            $email_link_text = '/email'; 
     
    690691      function get_mostemailed($mode = '', $limit = 10, $chars = 0, $echo = true) { 
    691692            global $wpdb, $post; 
     693            $temp_post = $post; 
    692694            $where = ''; 
    693695            $temp = ''; 
     
    715717                  $temp = '<li>'.__('N/A', 'wp-email').'</li>'."\n"; 
    716718            } 
     719            $post = $temp_post; 
    717720            if($echo) { 
    718721                  echo $temp; 
  • wp-email/trunk/wp-email.pot

    r39610 r40987  
    33"Project-Id-Version: WP-EMail 2.30\n" 
    44"Report-Msgid-Bugs-To: \n" 
    5 "POT-Creation-Date: 2008-04-11 02:13+0800\n" 
    6 "PO-Revision-Date: 2008-04-11 02:13+0800\n" 
     5"POT-Creation-Date: 2008-04-17 03:22+0800\n" 
     6"PO-Revision-Date: 2008-04-17 03:22+0800\n" 
    77"Last-Translator: Lester Chan <lesterchan@gmail.com>\n" 
    88"Language-Team: Lester Chan <lesterchan@gmail.com>\n" 
     
    9393 
    9494#: email-manager.php:126 
    95 #: wp-email.php:527 
    96 #: wp-email.php:664 
    97 #: wp-email.php:957 
    98 #: wp-email.php:994 
    99 #: wp-email.php:1205 
     95#: wp-email.php:528 
     96#: wp-email.php:665 
     97#: wp-email.php:960 
     98#: wp-email.php:997 
     99#: wp-email.php:1208 
    100100msgid "Success" 
    101101msgstr "" 
    102102 
    103103#: email-manager.php:127 
    104 #: wp-email.php:678 
    105 #: wp-email.php:969 
    106 #: wp-email.php:1206 
     104#: wp-email.php:679 
     105#: wp-email.php:972 
     106#: wp-email.php:1209 
    107107msgid "Failed" 
    108108msgstr "" 
     
    311311 
    312312#: email-options.php:122 
    313 #: wp-email.php:1283 
     313#: wp-email.php:1286 
    314314msgid "E-Mail '%EMAIL_POST_TITLE%' To A Friend" 
    315315msgstr "" 
    316316 
    317317#: email-options.php:125 
    318 #: wp-email.php:1284 
     318#: wp-email.php:1287 
    319319msgid "Email a copy of <strong>'%EMAIL_POST_TITLE%'</strong> to a friend" 
    320320msgstr "" 
    321321 
    322322#: email-options.php:128 
    323 #: wp-email.php:1258 
     323#: wp-email.php:1261 
    324324msgid "Recommended Article By %EMAIL_YOUR_NAME%: %EMAIL_POST_TITLE%" 
    325325msgstr "" 
     
    349349 
    350350#: email-options.php:137 
    351 #: wp-email.php:1269 
     351#: wp-email.php:1272 
    352352msgid "Back to %EMAIL_POST_TITLE%" 
    353353msgstr "" 
    354354 
    355355#: email-options.php:140 
    356 #: wp-email.php:1270 
     356#: wp-email.php:1273 
    357357msgid "An error has occurred when trying to send this email: " 
    358358msgstr "" 
    359359 
    360360#: email-options.php:143 
    361 #: wp-email.php:1271 
     361#: wp-email.php:1274 
    362362msgid "An error has occurred: " 
    363363msgstr "" 
     
    812812 
    813813#: wp-email.php:57 
    814 #: wp-email.php:344 
     814#: wp-email.php:345 
    815815msgid "E-Mail" 
    816816msgstr "" 
     
    820820msgstr "" 
    821821 
    822 #: wp-email.php:155 
     822#: wp-email.php:156 
    823823msgid "The Following Error Occurs:" 
    824824msgstr "" 
    825825 
    826 #: wp-email.php:156 
     826#: wp-email.php:157 
    827827msgid "- Your Name is empty/invalid" 
    828828msgstr "" 
    829829 
    830 #: wp-email.php:157 
     830#: wp-email.php:158 
    831831msgid "- Your Email is empty/invalid" 
    832832msgstr "" 
    833833 
    834 #: wp-email.php:158 
     834#: wp-email.php:159 
    835835msgid "- Your Remarks is invalid" 
    836836msgstr "" 
    837837 
    838 #: wp-email.php:159 
     838#: wp-email.php:160 
    839839msgid "- Friend Name(s) is empty" 
    840840msgstr "" 
    841841 
    842 #: wp-email.php:160 
     842#: wp-email.php:161 
    843843msgid "- Friend Name is empty/invalid:" 
    844844msgstr "" 
    845845 
    846 #: wp-email.php:161 
     846#: wp-email.php:162 
    847847#, php-format 
    848848msgid "- Maximum %s Friend Name(s) allowed" 
    849849msgstr "" 
    850850 
    851 #: wp-email.php:162 
     851#: wp-email.php:163 
    852852msgid "- Friend Email(s) is empty" 
    853853msgstr "" 
    854854 
    855 #: wp-email.php:163 
     855#: wp-email.php:164 
    856856msgid "- Friend Email is invalid:" 
    857857msgstr "" 
    858858 
    859 #: wp-email.php:164 
     859#: wp-email.php:165 
    860860#, php-format 
    861861msgid "- Maximum %s Friend Email(s) allowed" 
    862862msgstr "" 
    863863 
    864 #: wp-email.php:165 
     864#: wp-email.php:166 
    865865msgid "- Friend Name(s) count does not tally with Friend Email(s) count" 
    866866msgstr "" 
    867867 
    868 #: wp-email.php:166 
     868#: wp-email.php:167 
    869869msgid "- Image Verification is empty" 
    870870msgstr "" 
    871871 
    872 #: wp-email.php:292 
     872#: wp-email.php:293 
    873873msgid "Note: There is an email link embedded within this post, please visit this post to email it." 
    874874msgstr "" 
    875875 
    876 #: wp-email.php:363 
     876#: wp-email.php:364 
    877877#, php-format 
    878878msgid "Protected: %s" 
    879879msgstr "" 
    880880 
    881 #: wp-email.php:365 
     881#: wp-email.php:366 
    882882#, php-format 
    883883msgid "Private: %s" 
    884884msgstr "" 
    885885 
    886 #: wp-email.php:432 
     886#: wp-email.php:433 
    887887msgid "Password Protected Post" 
    888888msgstr "" 
    889889 
    890 #: wp-email.php:636 
     890#: wp-email.php:637 
    891891#, php-format 
    892892msgid "Separate multiple entries with a comma. Maximum %s entries." 
    893893msgstr "" 
    894894 
    895 #: wp-email.php:705 
    896 #: wp-email.php:711 
     895#: wp-email.php:707 
     896#: wp-email.php:713 
    897897msgid "emails" 
    898898msgstr "" 
    899899 
    900 #: wp-email.php:715 
    901 #: wp-email.php:886 
    902 #: wp-email.php:968 
     900#: wp-email.php:717 
     901#: wp-email.php:889 
     902#: wp-email.php:971 
    903903msgid "N/A" 
    904904msgstr "" 
    905905 
    906 #: wp-email.php:798 
     906#: wp-email.php:801 
    907907msgid "Your Name is empty" 
    908908msgstr "" 
    909909 
    910 #: wp-email.php:801 
     910#: wp-email.php:804 
    911911msgid "Your Name is invalid" 
    912912msgstr "" 
    913913 
    914 #: wp-email.php:807 
     914#: wp-email.php:810 
    915915msgid "Your Email is empty" 
    916916msgstr "" 
    917917 
    918 #: wp-email.php:810 
     918#: wp-email.php:813 
    919919msgid "Your Email is invalid" 
    920920msgstr "" 
    921921 
    922 #: wp-email.php:816 
     922#: wp-email.php:819 
    923923msgid "Your Remarks is invalid" 
    924924msgstr "" 
    925925 
    926 #: wp-email.php:822 
     926#: wp-email.php:825 
    927927msgid "Friend Name(s) is empty" 
    928928msgstr "" 
    929929 
    930 #: wp-email.php:828 
     930#: wp-email.php:831 
    931931#, php-format 
    932932msgid "Friend Name is empty: %s" 
    933933msgstr "" 
    934934 
    935 #: wp-email.php:830 
     935#: wp-email.php:833 
    936936#, php-format 
    937937msgid "Friend Name is invalid: %s" 
    938938msgstr "" 
    939939 
    940 #: wp-email.php:844 
     940#: wp-email.php:847 
    941941msgid "Friend Email(s) is empty" 
    942942msgstr "" 
    943943 
    944 #: wp-email.php:850 
     944#: wp-email.php:853 
    945945#, php-format 
    946946msgid "Friend Email is empty: %s" 
    947947msgstr "" 
    948948 
    949 #: wp-email.php:852 
     949#: wp-email.php:855 
    950950#, php-format 
    951951msgid "Friend Email is invalid: %s" 
    952952msgstr "" 
    953953 
    954 #: wp-email.php:865 
     954#: wp-email.php:868 
    955955#, php-format 
    956956msgid "Maximum %s Friend(s) allowed" 
    957957msgstr "" 
    958958 
    959 #: wp-email.php:869 
     959#: wp-email.php:872 
    960960msgid "Friend Name(s) count does not tally with Friend Email(s) count" 
    961961msgstr "" 
    962962 
    963 #: wp-email.php:876 
     963#: wp-email.php:879 
    964964msgid "Image Verification is empty" 
    965965msgstr "" 
    966966 
    967 #: wp-email.php:879 
     967#: wp-email.php:882 
    968968msgid "Image Verification failed" 
    969969msgstr "" 
    970970 
    971 #: wp-email.php:1061 
     971#: wp-email.php:1064 
    972972msgid "* Required Field" 
    973973msgstr "" 
    974974 
    975 #: wp-email.php:1064 
     975#: wp-email.php:1067 
    976976msgid "Your Name: *" 
    977977msgstr "" 
    978978 
    979 #: wp-email.php:1070 
     979#: wp-email.php:1073 
    980980msgid "Your E-Mail: *" 
    981981msgstr "" 
    982982 
    983 #: wp-email.php:1076 
     983#: wp-email.php:1079 
    984984msgid "Your Remark:" 
    985985msgstr "" 
    986986 
    987 #: wp-email.php:1082 
     987#: wp-email.php:1085 
    988988msgid "Friend's Name: *" 
    989989msgstr "" 
    990990 
    991 #: wp-email.php:1087 
     991#: wp-email.php:1090 
    992992msgid "Friend's E-Mail: *" 
    993993msgstr "" 
    994994 
    995 #: wp-email.php:1092 
     995#: wp-email.php:1095 
    996996msgid "Image Verification: *" 
    997997msgstr "" 
    998998 
    999 #: wp-email.php:1093 
     999#: wp-email.php:1096 
    10001000msgid "E-Mail Image Verification" 
    10011001msgstr "" 
    10021002 
    1003 #: wp-email.php:1096 
     1003#: wp-email.php:1099 
    10041004msgid "     Mail It!     " 
    10051005msgstr "" 
    10061006 
    1007 #: wp-email.php:1102 
     1007#: wp-email.php:1105 
    10081008#, php-format 
    10091009msgid "Please wait for <strong>%s Minutes</strong> before sending the next article." 
    10101010msgstr "" 
    10111011 
    1012 #: wp-email.php:1104 
     1012#: wp-email.php:1107 
    10131013msgid "Loading" 
    10141014msgstr "" 
    10151015 
    1016 #: wp-email.php:1167 
    1017 #: wp-email.php:1169 
    1018 #: wp-email.php:1202 
     1016#: wp-email.php:1170 
     1017#: wp-email.php:1172 
     1018#: wp-email.php:1205 
    10191019msgid "WP-EMail" 
    10201020msgstr "" 
    10211021 
    1022 #: wp-email.php:1180 
    1023 #: wp-email.php:1182 
     1022#: wp-email.php:1183 
     1023#: wp-email.php:1185 
    10241024msgid "Most Emailed Posts" 
    10251025msgstr "" 
    10261026 
    1027 #: wp-email.php:1204 
     1027#: wp-email.php:1207 
    10281028msgid "emails were sent." 
    10291029msgstr "" 
    10301030 
    1031 #: wp-email.php:1205 
     1031#: wp-email.php:1208 
    10321032msgid "emails were sent successfully." 
    10331033msgstr "" 
    10341034 
    1035 #: wp-email.php:1206 
     1035#: wp-email.php:1209 
    10361036msgid "emails failed to send." 
    10371037msgstr "" 
    10381038 
    1039 #: wp-email.php:1218 
     1039#: wp-email.php:1221 
    10401040msgid "Most Emailed Post" 
    10411041msgstr "" 
    10421042 
    1043 #: wp-email.php:1259 
     1043#: wp-email.php:1262 
    10441044msgid "<p>Hi <strong>%EMAIL_FRIEND_NAME%</strong>,<br />Your friend, <strong>%EMAIL_YOUR_NAME%</strong>, has recommended this article entitled '<strong>%EMAIL_POST_TITLE%</strong>' to you.</p><p><strong>Here is his/her remark:</strong><br />%EMAIL_YOUR_REMARKS%</p><p><strong>%EMAIL_POST_TITLE%</strong><br />Posted By %EMAIL_POST_AUTHOR% On %EMAIL_POST_DATE% In %EMAIL_POST_CATEGORY%</p>%EMAIL_POST_CONTENT%<p>Article taken from %EMAIL_BLOG_NAME% - <a href=\"%EMAIL_BLOG_URL%\">%EMAIL_BLOG_URL%</a><br />URL to article: <a href=\"%EMAIL_PERMALINK%\">%EMAIL_PERMALINK%</a></p>" 
    10451045msgstr "" 
    10461046 
    1047 #: wp-email.php:1260 
     1047#: wp-email.php:1263 
    10481048msgid "" 
    10491049"Hi %EMAIL_FRIEND_NAME%,\n" 
     
    10601060msgstr "" 
    10611061 
    1062 #: wp-email.php:1269 
     1062#: wp-email.php:1272 
    10631063msgid "Article: <strong>%EMAIL_POST_TITLE%</strong> has been sent to <strong>%EMAIL_FRIEND_NAME% (%EMAIL_FRIEND_EMAIL%)</strong></p><p>&laquo; <a href=\"%EMAIL_PERMALINK%\">" 
    10641064msgstr "" 
    10651065 
    1066 #: wp-email.php:1278 
     1066#: wp-email.php:1281 
    10671067msgid "Email This Post" 
    10681068msgstr "" 
    10691069 
    1070 #: wp-email.php:1278 
     1070#: wp-email.php:1281 
    10711071msgid "Email This Page" 
    10721072msgstr ""