bug 985: Fix PDF generation for Japanese ("ja_JP" is now "ja" in the
authorMichael Tänzer <neo@nhng.de>
Mon, 17 Oct 2011 00:20:27 +0000 (02:20 +0200)
committerMichael Tänzer <neo@nhng.de>
Mon, 17 Oct 2011 00:20:27 +0000 (02:20 +0200)
translation settings)

Signed-off-by: Michael Tänzer <neo@nhng.de>
www/cap.php
www/ttp.php

index 6b08d38..73380e1 100644 (file)
@@ -15,7 +15,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-       if($_SESSION['_config']['language'] != "ja_JP")
+       if($_SESSION['_config']['language'] != "ja")
        {
                define('FPDF_FONTPATH','/usr/share/fpdf/font/');
                require_once('/usr/share/ufpdf/fpdf.php');
@@ -35,7 +35,7 @@
                {
                        $this->Image((array_key_exists('bw',$_REQUEST) && $_REQUEST['bw'])?'images/CAcert-logo-mono-1000.png':'images/CAcert-logo-colour-1000.png',8,8,100);
                        $this->SetFont('Arial','B',14);
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',14);
                        $this->Cell(100);
                        $this->Cell(40,20,recode($_SESSION['_config']['recode'], _("CAcert Assurance Programme")));
 
                        $this->SetY(36);
                        $this->SetFont('Arial','I',8);
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','I',8);
                        $this->Cell(0,0,'CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia - http://www.CAcert.org',0,0,'C');
                        $this->Ln(3);
                        $this->SetFont('Arial','',6);
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',6);
                        $this->Cell(0,0, recode($_SESSION['_config']['recode'], _("CAcert's Root Certificate fingerprints")).": A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B "._("and")." 135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33",0,0,'C');
                        $this->SetLineWidth(0.05);
@@ -71,7 +71,7 @@
                        // Show text blurb at top of page
                        $this->SetY(45);
                        $this->SetFont('Arial','',10);
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',10);
                        $this->Write(4,sprintf(recode($_SESSION['_config']['recode'], _("To the Assurer: The CAcert Assurance Programme (CAP) aims to verify the identities of Internet users through face-to-face witnessing of government issued identity documents. The Applicant asks you to verify to CAcert.org that you have met them and verified their identity against one or more original, trusted, government photo identity documents. If you have ANY doubts or concerns about the Applicant's identity, DO NOT COMPLETE OR SIGN this form. For more information about the CAcert Assurance Programme, including detailed guides for CAcert Assurers, please visit: %s")), "http://www.CAcert.org"));
                        $this->Ln(10);
                        $this->Rect(11, $top, $this->w - 25, 60, "D");  //50 -> 60
                        $this->SetXY(11, $top + 5);
                        $this->SetFont("Arial", "BUI", "20");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','BUI',20);
                        $this->Write(0, recode($_SESSION['_config']['recode'], _("Applicant's Statement")));
                        $this->Rect(13, $top + 10, $this->w - 29, 6, "D");
                        $this->Line(80, $top + 10, 80, $top + 16);
                        $this->SetXY(15, $top + 13);
                        $this->SetFont("Arial", "B", "12");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','B',12);
                        $this->Write(0, recode($_SESSION['_config']['recode'], _("Names")).":");
                        if($name)
                        {
                                $this->SetXY(82, $top + 13);
                                $this->SetFont("Arial", '', "11");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',11);
                                $this->Write(0, $name);
                        }
                        $this->Line(80, $top + 16, 80, $top + 22);
                        $this->SetXY(15, $top + 19);
                        $this->SetFont("Arial", "B", "12");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','B',12);
                        $this->Write(0, recode($_SESSION['_config']['recode'], _("Date of Birth")).": ");
                        $this->SetFont("Arial", "", "8");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',8);
                        $this->Write(0, "(".recode($_SESSION['_config']['recode'], _("YYYY-MM-DD")).")");
                        if($dob)
                        {
                                $this->SetXY(82, $top + 19);
                                $this->SetFont("Arial", "", "11");
-                               if($_SESSION['_config']['language'] == "ja_JP")
+                               if($_SESSION['_config']['language'] == "ja")
                                        $this->SetFont('SJIS','',11);
                                $this->Write(0, $dob);
                        }
                        $this->Line(80, $top + 22, 80, $top + 28);
                        $this->SetXY(15, $top + 25);
                        $this->SetFont("Arial", "B", "12");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','B',12);
                        $this->Write(0, recode($_SESSION['_config']['recode'], _("Email Address")).":");
                        if($email)
                        {
                                $this->SetXY(82, $top + 25);
                                $this->SetFont("Arial", "", "11");
-                               if($_SESSION['_config']['language'] == "ja_JP")
+                               if($_SESSION['_config']['language'] == "ja")
                                        $this->SetFont('SJIS','',11);
                                $this->Write(0, $email);
                        }
                        $this->SetXY(13, $top + 32);
                        $this->SetFont("Arial", "", "9");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',9);
                        $this->MultiCell($this->w - 29, 3, recode($_SESSION['_config']['recode'], _("I hereby confirm that the information stated above is both true and correct, and request the CAcert Assurer (identified below) to verify me according to CAcert Assurance Policy.")));
 // new da start
                        $this->SetXY(13, $top + 42);
                        $this->SetFont("Arial", "", "9");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',9);
                        $this->MultiCell($this->w - 29, 3, recode($_SESSION['_config']['recode'], _("I agree to the CAcert Community Agreement.")." ( http://www.cacert.org/policy/CAcertCommunityAgreement.php )"));
 // new da end
                                $this->Write(0, "20___-___-___");
                        } else {
                                $this->SetFont("Arial", "U", "10");
-                               if($_SESSION['_config']['language'] == "ja_JP")
+                               if($_SESSION['_config']['language'] == "ja")
                                        $this->SetFont('SJIS','U',10);
                                $this->Write(0, str_pad($date, 13, " "));
                        }
                        $this->Rect(11, $top, $this->w - 25, 83, "D"); //63->93
                        $this->SetXY(11, $top + 5);
                        $this->SetFont("Arial", "BUI", "20");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','BUI',20);
                        $this->Write(0, recode($_SESSION['_config']['recode'], _("CAcert Assurer")));
                        $this->SetFont("Arial", "", "9");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',9);
                        $this->SetXY(13, $top + 15);
                        if($assurer)
                        {
                                $this->Write(0, recode($_SESSION['_config']['recode'], _("Assurer's Name")).": ");
                                $this->SetFont("Arial", "", "10");
-                               if($_SESSION['_config']['language'] == "ja_JP")
+                               if($_SESSION['_config']['language'] == "ja")
                                        $this->SetFont('SJIS','U',10);
 //                             $this->MultiCell($this->w - 70, 2, recode($_SESSION['_config']['recode'], $assurer));
                                $this->Write(0, str_pad($assurer, 50, " "));
                                $this->Write(0, recode($_SESSION['_config']['recode'], _("Assurer's Name")).": ________________________________________________________________");
                        }
                        $this->SetFont("Arial", "", "9");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',9);
                        $this->SetXY(13, $top + 22);
                        $this->MultiCell($this->w - 34, 3, recode($_SESSION['_config']['recode'], _("Photo ID Shown: (ID types, not numbers. eg Drivers license, Passport)")));
                        } else {
                                $this->Write(0, "1. ");
                                $this->SetFont("Arial", "U", "10");
-                               if($_SESSION['_config']['language'] == "ja_JP")
+                               if($_SESSION['_config']['language'] == "ja")
                                        $this->SetFont('SJIS','U',10);
                                $this->Write(0, str_pad($document1, 90, " "));
                        }
                        $this->SetFont("Arial", "", "9");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',9);
                        $this->SetXY(13, $top + 35);
                        if($document2 == "")
                        } else {
                                $this->Write(0, "2. ");
                                $this->SetFont("Arial", "U", "10");
-                               if($_SESSION['_config']['language'] == "ja_JP")
+                               if($_SESSION['_config']['language'] == "ja")
                                        $this->SetFont('SJIS','U',10);
                                $this->Write(0, str_pad($document2, 90, " "));
                        }
                        $this->SetFont("Arial", "", "9");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',9);
                        $this->SetXY(13, $top + 45);
                        $this->Write(0, recode($_SESSION['_config']['recode'], _("Location of Face-to-face Meeting")).": ");
                                $this->Write(0, "_____________________________________________");
                        } else {
                                $this->SetFont("Arial", "U", "10");
-                               if($_SESSION['_config']['language'] == "ja_JP")
+                               if($_SESSION['_config']['language'] == "ja")
                                        $this->SetFont('SJIS','U',10);
                                $this->Write(0, str_pad($location, 70, " "));
                        }
                        $this->SetFont("Arial", "", "9");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',9);
                        $this->SetXY(13, $top + 50);
                        if($maxpoints > 0)
                                $this->Write(0, recode($_SESSION['_config']['recode'], _("Points Allocated")).": ______________");
                        }
                        $this->SetFont("Arial", "", "9");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',9);
                        $this->SetXY(13, $top + 54);
                        $this->MultiCell($this->w - 33, 3, recode($_SESSION['_config']['recode'], _("I, the Assurer, hereby confirm that I have verified the Member according to CAcert Assurance Policy.")));
                        $this->MultiCell($this->w - 33, 3, recode($_SESSION['_config']['recode'], _("I am a CAcert Community Member, have passed the Assurance Challenge, and have been assured with at least 100 Assurance Points.")));
 
                        $this->SetFont("Arial", "", "9");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',9);
                        $this->SetXY(13, $top + 74);  //22->67
                        $this->Write(0, recode($_SESSION['_config']['recode'], _("Assurer's signature")).": __________________________________");
                                $this->Write(0, "20___-___-___");
                        } else {
                                $this->SetFont("Arial", "U", "10");
-                               if($_SESSION['_config']['language'] == "ja_JP")
+                               if($_SESSION['_config']['language'] == "ja")
                                        $this->SetFont('SJIS','U',10);
                                $this->Write(0, str_pad($date, 13, " "));
                        }
                $maxpoints = 0;
 
        $pdf = new PDF('P', 'mm', $format);
-       if($_SESSION['_config']['language'] == "ja_JP")
+       if($_SESSION['_config']['language'] == "ja")
                $pdf->AddSJISFont();
        $pdf->Open();
        $pdf->AddPage();
index 2240518..6385127 100644 (file)
@@ -15,7 +15,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-       if($_SESSION['_config']['language'] != "ja_JP")
+       if($_SESSION['_config']['language'] != "ja")
        {
                define('FPDF_FONTPATH','/usr/share/fpdf/font/');
                require_once('/usr/share/ufpdf/fpdf.php');
@@ -40,7 +40,7 @@
                {
                        $this->Image($_REQUEST['bw']?'images/CAcert-logo-mono-1000.png':'images/CAcert-logo-colour-1000.png',8,8,100);
                        $this->SetFont('Arial','B',14);
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','B',14);
                        $this->Cell(100);
                        $this->Cell(40,20,recode($_SESSION['_config']['recode'], _("Trusted Third Party")));
                {
                        $this->SetY(-10);
                        $this->SetFont('Arial','I',8);
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','I',8);
                        $this->Cell(0,0,'CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia - http://www.CAcert.org',0,0,'C');
                        $this->SetY(-7);
                        $this->SetFont('Arial','',6);
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',6);
                        $this->Cell(0,0, recode($_SESSION['_config']['recode'], _("CAcert's Root Certificate fingerprints")).": A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B "._("and")." 135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33",0,0,'C');
                }
@@ -72,7 +72,7 @@
                        // Show text blurb at top of page
                        $this->SetY(40);
                        $this->SetFont('Arial','',10);
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','',10);
                        $this->Write(4, recode($_SESSION['_config']['recode'], _("The CAcert Trusted Third Party (TTP) Programme is designed to assure Internet user identities through personal verification of government issued identity documents.")));
                        $this->Ln(7);
                        $this->Line(120, $top + 6, 120, $top + 36);
                        $this->SetXY(11, $top + 3);
                        $this->SetFont("Arial", "BUI", "12");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','BUI',12);
                        $this->Write(0, recode($_SESSION['_config']['recode'],_("Person Verifying Applicant's Identity")));
                        $this->SetXY(11, $top + 9);
                        $this->SetFont("Arial", "B", "8");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','B',8);
                        $this->Write(0, recode($_SESSION['_config']['recode'],_("Names").":"));
                        $this->SetXY(120, $top + 9);
                        $this->Write(0, recode($_SESSION['_config']['recode'],_("Office Street Address").":"));
                        $this->SetFont("Arial", "B", "6");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','B',6);
                        $this->SetXY(11, $top + 14);
                        $this->Write(0, recode($_SESSION['_config']['recode'],_("Profession (Please circle one)")).":");
                        $this->SetXY(11, $top + 22);
                        $this->Write(0, recode($_SESSION['_config']['recode'], "("._("as applicable")."):"));
                        $this->SetFont("Arial", "B", "8");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','B',8);
                        $this->SetXY(11, $top + 27);
                        $this->Write(0, recode($_SESSION['_config']['recode'],_("Office Phone")).":");
                        $this->Line(120, $top + 6, 120, $top + 36);
                        $this->SetXY(11, $top + 3);
                        $this->SetFont("Arial", "BUI", "12");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','BUI',12);
                        $this->Write(0, recode($_SESSION['_config']['recode'],_("Applicant Information")));
                        $this->SetXY(11, $top + 9);
                        $this->SetFont("Arial", "B", "8");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','B',8);
                        $this->Write(0, recode($_SESSION['_config']['recode'],_("Full Name (as shown on ID)").":"));
                        if($name)
                        $this->SetXY(11, $top + 21);
                        $this->Write(0, recode($_SESSION['_config']['recode'],_("Date of Birth")).": ");
                        $this->SetFont("Arial", "B", "6");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','B',6);
                        $this->Write(0, "(".recode($_SESSION['_config']['recode'], _("YYYY-MM-DD")).")");
                        $this->SetFont("Arial", "B", "8");
-                       if($_SESSION['_config']['language'] == "ja_JP")
+                       if($_SESSION['_config']['language'] == "ja")
                                $this->SetFont('SJIS','B',8);
                        if($dob)
                        {
                $format = "A4";
 
        $pdf = new PDF('P', 'mm', $format);
-       if($_SESSION['_config']['language'] == "ja_JP")
+       if($_SESSION['_config']['language'] == "ja")
                $pdf->AddSJISFont();
        $pdf->Open();
        $pdf->AddPage();