Modify Chinese translation in properties file, and add new translation that...

Stardrad Yin

2013-01-23 aefb59ef98522ef8a10ab64b25840f11e622e1c7

 src/com/gitblit/authority/GitblitAuthority.java

@@ -17,9 +17,11 @@


import java.awt.BorderLayout;

import java.awt.Container;

import java.awt.Desktop;

import java.awt.Dimension;

import java.awt.EventQueue;

import java.awt.FlowLayout;

import java.awt.GridLayout;

import java.awt.Insets;

import java.awt.Point;

import java.awt.event.ActionEvent;

@@ -35,6 +37,7 @@
import java.io.FileWriter;

import java.io.FilenameFilter;

import java.io.IOException;

import java.net.URI;

import java.security.PrivateKey;

import java.security.cert.CertificateFactory;

import java.security.cert.X509Certificate;

@@ -65,7 +68,9 @@
import javax.swing.JScrollPane;

import javax.swing.JSplitPane;

import javax.swing.JTable;

import javax.swing.JTextArea;

import javax.swing.JTextField;

import javax.swing.JToolBar;

import javax.swing.RowFilter;

import javax.swing.SwingConstants;

import javax.swing.UIManager;

@@ -90,6 +95,7 @@
import com.gitblit.client.Translation;

import com.gitblit.models.UserModel;

import com.gitblit.utils.ArrayUtils;

import com.gitblit.utils.FileUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.utils.TimeUtils;

import com.gitblit.utils.X509Utils;

@@ -129,7 +135,24 @@


   private JButton certificateDefaultsButton;



   private JButton newSSLCertificate;



   public static void main(String... args) {

      // filter out the baseFolder parameter

      String folder = "data";

      for (int i = 0; i< args.length; i++) {

         String arg = args[i];

         if (arg.equals("--baseFolder")) {

            if (i + 1 == args.length) {

               System.out.println("Invalid --baseFolder parameter!");

               System.exit(-1);

            } else if (args[i + 1] != ".") {

               folder = args[i+1];

            }

            break;

         }

      }

      final String baseFolder = folder;

      EventQueue.invokeLater(new Runnable() {

         public void run() {

            try {

@@ -137,7 +160,7 @@
            } catch (Exception e) {

            }

            GitblitAuthority authority = new GitblitAuthority();

            authority.initialize();

            authority.initialize(baseFolder);

            authority.setLocationRelativeTo(null);

            authority.setVisible(true);

         }

@@ -150,7 +173,7 @@
      defaultSorter = new TableRowSorter<UserCertificateTableModel>(tableModel);

   }

   

   public void initialize() {

   public void initialize(String baseFolder) {

      setIconImage(new ImageIcon(getClass().getResource("/gitblt-favicon.png")).getImage());

      setTitle("Gitblit Certificate Authority v" + Constants.VERSION + " (" + Constants.VERSION_DATE + ")");

      setContentPane(getUI());

@@ -166,10 +189,10 @@
         }

      });      



      setSizeAndPosition();

		
      File folder = new File(System.getProperty("user.dir"));

      File folder = new File(baseFolder).getAbsoluteFile();

      load(folder);

		
      setSizeAndPosition();

   }

   

   private void setSizeAndPosition() {

@@ -222,7 +245,7 @@
   }

   

   private StoredConfig getConfig() throws IOException, ConfigInvalidException {

      File configFile  = new File(System.getProperty("user.dir"), X509Utils.CA_CONFIG);

      File configFile  = new File(folder, X509Utils.CA_CONFIG);

      FileBasedConfig config = new FileBasedConfig(configFile, FS.detect());

      config.load();

      return config;

@@ -235,30 +258,31 @@
      }

      gitblitSettings = new FileSettings(file.getAbsolutePath());

      mail = new MailExecutor(gitblitSettings);

      String us = gitblitSettings.getString(Keys.realm.userService, "users.conf");

      String us = gitblitSettings.getString(Keys.realm.userService, "${baseFolder}/users.conf");

      String ext = us.substring(us.lastIndexOf(".") + 1).toLowerCase();

      IUserService service = null;

      if (!ext.equals("conf") && !ext.equals("properties")) {

         if (us.equals("com.gitblit.LdapUserService")) {

            us = gitblitSettings.getString(Keys.realm.ldap.backingUserService, "users.conf");		
            us = gitblitSettings.getString(Keys.realm.ldap.backingUserService, "${baseFolder}/users.conf");		
         } else if (us.equals("com.gitblit.LdapUserService")) {

            us = gitblitSettings.getString(Keys.realm.redmine.backingUserService, "users.conf");

            us = gitblitSettings.getString(Keys.realm.redmine.backingUserService, "${baseFolder}/users.conf");

         }

      }



      if (us.endsWith(".conf")) {

         service = new ConfigUserService(new File(us));

         service = new ConfigUserService(FileUtils.resolveParameter(Constants.baseFolder$, folder, us));

      } else {

         throw new RuntimeException("Unsupported user service: " + us);

      }

      

      service = new ConfigUserService(new File(us));

      service = new ConfigUserService(FileUtils.resolveParameter(Constants.baseFolder$, folder, us));

      return service;

   }

   

   private void load(File folder) {

      this.folder = folder;

      this.userService = loadUsers(folder);

      System.out.println(Constants.baseFolder$ + " set to " + folder);

      if (userService == null) {

         JOptionPane.showMessageDialog(this, MessageFormat.format("Sorry, {0} doesn't look like a Gitblit GO installation.", folder));

      } else {

@@ -294,25 +318,38 @@
         

         File caKeystore = new File(folder, X509Utils.CA_KEY_STORE);

         if (!caKeystore.exists()) {

				
            if (!X509Utils.unlimitedStrength) {

               // prompt to confirm user understands JCE Standard Strength encryption

               int res = JOptionPane.showConfirmDialog(GitblitAuthority.this, Translation.get("gb.jceWarning"),

                     Translation.get("gb.warning"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);

               if (res != JOptionPane.YES_OPTION) {

                  if (Desktop.isDesktopSupported()) {

                     if (Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {

                        try {

                           Desktop.getDesktop().browse(URI.create("http://www.oracle.com/technetwork/java/javase/downloads/index.html"));

                        } catch (IOException e) {

                        }

                     }

                  }

                  System.exit(1);

               }

            }

				
            // show certificate defaults dialog 

            certificateDefaultsButton.doClick();

				
            // create "localhost" ssl certificate

            prepareX509Infrastructure();

         }

      }

   }

   

   private boolean prepareX509Infrastructure() {

      if (caKeystorePassword == null) {

         caKeystorePassword = gitblitSettings.getString(Keys.server.storePassword, null);

         JPasswordField pass = new JPasswordField(10){

            private static final long serialVersionUID = 1L;



            public void addNotify()             
             {                 
                 super.addNotify();

                 requestFocusInWindow();             
             }         
         }; 
         JPasswordField pass = new JPasswordField(10);

         pass.setText(caKeystorePassword);

         pass.addAncestorListener(new RequestFocusListener());

         JPanel panel = new JPanel(new BorderLayout());

         panel.add(new JLabel(Translation.get("gb.enterKeystorePassword")), BorderLayout.NORTH);

         panel.add(pass, BorderLayout.CENTER);

@@ -320,12 +357,13 @@
         if (result == JOptionPane.OK_OPTION) {

            caKeystorePassword = new String(pass.getPassword());

         } else {

            caKeystorePassword = null;

            return false;

         }

      }



      X509Metadata metadata = new X509Metadata("localhost", caKeystorePassword);

      setMetadataDefaults(metadata);

      metadata.notAfter = new Date(System.currentTimeMillis() + 10*TimeUtils.ONEYEAR);

      X509Utils.prepareX509Infrastructure(metadata, folder, this);

      return true;

   }

@@ -393,29 +431,11 @@
            }



            Date notAfter = metadata.notAfter;

            metadata.serverHostname = gitblitSettings.getString(Keys.web.siteName, Constants.NAME);

            if (StringUtils.isEmpty(metadata.serverHostname)) {

               metadata.serverHostname = Constants.NAME;

            }

            UserModel user = ucm.user;				
				
            // set default values from config file

            File certificatesConfigFile = new File(folder, X509Utils.CA_CONFIG);

            FileBasedConfig config = new FileBasedConfig(certificatesConfigFile, FS.detect());

            if (certificatesConfigFile.exists()) {

               try {

                  config.load();

               } catch (Exception e) {

                  Utils.showException(GitblitAuthority.this, e);

               }

               NewCertificateConfig certificateConfig = NewCertificateConfig.KEY.parse(config);

               certificateConfig.update(metadata);

            }

				
            // restore expiration date

            setMetadataDefaults(metadata);

            metadata.notAfter = notAfter;

            

            // set user's specified OID values

            UserModel user = ucm.user;				
            if (!StringUtils.isEmpty(user.organizationalUnit)) {

               metadata.oids.put("OU", user.organizationalUnit);

            }

@@ -439,12 +459,8 @@
            if (ucm.expires == null || metadata.notAfter.before(ucm.expires)) {

               ucm.expires = metadata.notAfter;

            }

            ucm.update(config);

            try {

               config.save();

            } catch (Exception e) {

               Utils.showException(GitblitAuthority.this, e);

            }

				
            updateAuthorityConfig(ucm);

            

            // refresh user

            ucm.certs = null;

@@ -567,15 +583,26 @@
               }

            };



            JTextField durationTF = new JTextField(4);

            durationTF.setInputVerifier(verifier);

            durationTF.setVerifyInputWhenFocusTarget(true);

            durationTF.setText("" + certificateConfig.duration);

            JPanel durationPanel = Utils.newFieldPanel(Translation.get("gb.duration"), durationTF, Translation.get("gb.duration.days").replace("{0}",  "").trim());

            JTextField siteNameTF = new JTextField(20);

            siteNameTF.setText(gitblitSettings.getString(Keys.web.siteName, "Gitblit"));

            JPanel siteNamePanel = Utils.newFieldPanel(Translation.get("gb.siteName"),

                  siteNameTF, Translation.get("gb.siteNameDescription"));



            JTextField validityTF = new JTextField(4);

            validityTF.setInputVerifier(verifier);

            validityTF.setVerifyInputWhenFocusTarget(true);

            validityTF.setText("" + certificateConfig.duration);

            JPanel validityPanel = Utils.newFieldPanel(Translation.get("gb.validity"),

                  validityTF, Translation.get("gb.duration.days").replace("{0}",  "").trim());

				
            JPanel p1 = new JPanel(new GridLayout(0, 1, 5, 2));

            p1.add(siteNamePanel);

            p1.add(validityPanel);

				
            DefaultOidsPanel oids = new DefaultOidsPanel(metadata);



            JPanel panel = new JPanel(new BorderLayout());

            panel.add(durationPanel, BorderLayout.NORTH);

            panel.add(p1, BorderLayout.NORTH);

            panel.add(oids, BorderLayout.CENTER);



            int result = JOptionPane.showConfirmDialog(GitblitAuthority.this, 

@@ -584,9 +611,13 @@
            if (result == JOptionPane.OK_OPTION) {

               try {

                  oids.update(metadata);

                  certificateConfig.duration = Integer.parseInt(durationTF.getText());

                  certificateConfig.duration = Integer.parseInt(validityTF.getText());

                  certificateConfig.store(config, metadata);

                  config.save();

						
                  Map<String, String> updates = new HashMap<String, String>();

                  updates.put(Keys.web.siteName, siteNameTF.getText());

                  gitblitSettings.saveSettings(updates);

               } catch (Exception e1) {

                  Utils.showException(GitblitAuthority.this, e1);

               }

@@ -594,7 +625,7 @@
         }

      });

      

      JButton newSSLCertificate = new JButton(new ImageIcon(getClass().getResource("/rosette_16x16.png")));

      newSSLCertificate = new JButton(new ImageIcon(getClass().getResource("/rosette_16x16.png")));

      newSSLCertificate.setFocusable(false);

      newSSLCertificate.setToolTipText(Translation.get("gb.newSSLCertificate"));      

      newSSLCertificate.addActionListener(new ActionListener() {

@@ -609,7 +640,8 @@
            }

            final Date expires = dialog.getExpiration();

            final String hostname = dialog.getHostname();



            final boolean serveCertificate = dialog.isServeCertificate();

				
            AuthorityWorker worker = new AuthorityWorker(GitblitAuthority.this) {



               @Override

@@ -625,17 +657,31 @@
                  

                  // generate new SSL certificate

                  X509Metadata metadata = new X509Metadata(hostname, caKeystorePassword);

                  setMetadataDefaults(metadata);

                  metadata.notAfter = expires;

                  File serverKeystoreFile = new File(folder, X509Utils.SERVER_KEY_STORE);

                  X509Certificate cert = X509Utils.newSSLCertificate(metadata, caPrivateKey, caCert, serverKeystoreFile, GitblitAuthority.this);

                  return cert != null;

                  boolean hasCert = cert != null;

                  if (hasCert && serveCertificate) {

                     // update Gitblit https connector alias

                     Map<String, String> updates = new HashMap<String, String>();

                     updates.put(Keys.server.certificateAlias, metadata.commonName);

                     gitblitSettings.saveSettings(updates);

                  }

                  return hasCert;

               }



               @Override

               protected void onSuccess() {

                  JOptionPane.showMessageDialog(GitblitAuthority.this, 
                  if (serveCertificate) {

                     JOptionPane.showMessageDialog(GitblitAuthority.this, 
                           MessageFormat.format(Translation.get("gb.sslCertificateGeneratedRestart"), hostname),

                           Translation.get("gb.newSSLCertificate"), JOptionPane.INFORMATION_MESSAGE);

                  } else {

                     JOptionPane.showMessageDialog(GitblitAuthority.this, 
                        MessageFormat.format(Translation.get("gb.sslCertificateGenerated"), hostname),

                        Translation.get("gb.newSSLCertificate"), JOptionPane.INFORMATION_MESSAGE);

                  }

               }

            };

            

@@ -672,8 +718,7 @@
                     metadata.serverHostname = Constants.NAME;

                  }

                  metadata.userDisplayname = ucm.user.getDisplayName();

                  sendEmail(ucm.user, metadata, zip);

                  return true;

                  return sendEmail(ucm.user, metadata, zip);

               }



               @Override

@@ -684,6 +729,23 @@
               

            };

            worker.execute();            

         }

      });

		
      JButton logButton = new JButton(new ImageIcon(getClass().getResource("/script_16x16.png")));

      logButton.setFocusable(false);

      logButton.setToolTipText(Translation.get("gb.log"));		
      logButton.addActionListener(new ActionListener() {

         @Override

         public void actionPerformed(ActionEvent e) {

            File log = new File(folder, X509Utils.CERTS + File.separator + "log.txt");

            if (log.exists()) {

               String content = FileUtils.readContent(log,  "\n");

               JTextArea textarea = new JTextArea(content);

               JScrollPane scrollPane = new JScrollPane(textarea);

               scrollPane.setPreferredSize(new Dimension(700, 400));

               JOptionPane.showMessageDialog(GitblitAuthority.this, scrollPane, log.getAbsolutePath(), JOptionPane.INFORMATION_MESSAGE);

            }

         }

      });

      

@@ -699,10 +761,12 @@
         }

      });

      

      JPanel buttonControls = new JPanel(new FlowLayout(FlowLayout.LEFT, Utils.MARGIN, Utils.MARGIN));

      JToolBar buttonControls = new JToolBar(JToolBar.HORIZONTAL);

      buttonControls.setFloatable(false);

      buttonControls.add(certificateDefaultsButton);

      buttonControls.add(newSSLCertificate);

      buttonControls.add(emailBundle);

      buttonControls.add(logButton);



      JPanel userControls = new JPanel(new FlowLayout(FlowLayout.RIGHT, Utils.MARGIN, Utils.MARGIN));

      userControls.add(new JLabel(Translation.get("gb.filter")));

@@ -780,7 +844,7 @@
      }

   }

   

   private void sendEmail(UserModel user, X509Metadata metadata, File zip) {

   private boolean sendEmail(UserModel user, X509Metadata metadata, File zip) {

      // send email

      try {

         if (mail.isReady()) {

@@ -807,11 +871,51 @@
            message.setContent(mp);



            mail.sendNow(message);

            return true;

         } else {

            JOptionPane.showMessageDialog(GitblitAuthority.this, "Sorry, the mail server settings are not configured properly.\nCan not send email.", Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);

         }

      } catch (Exception e) {

         Utils.showException(GitblitAuthority.this, e);

      }

      return false;

   }

	
   private void setMetadataDefaults(X509Metadata metadata) {

      metadata.serverHostname = gitblitSettings.getString(Keys.web.siteName, Constants.NAME);

      if (StringUtils.isEmpty(metadata.serverHostname)) {

         metadata.serverHostname = Constants.NAME;

      }

		
      // set default values from config file

      File certificatesConfigFile = new File(folder, X509Utils.CA_CONFIG);

      FileBasedConfig config = new FileBasedConfig(certificatesConfigFile, FS.detect());

      if (certificatesConfigFile.exists()) {

         try {

            config.load();

         } catch (Exception e) {

            Utils.showException(GitblitAuthority.this, e);

         }

         NewCertificateConfig certificateConfig = NewCertificateConfig.KEY.parse(config);

         certificateConfig.update(metadata);

      }

   }

	
   private void updateAuthorityConfig(UserCertificateModel ucm) {

      File certificatesConfigFile = new File(folder, X509Utils.CA_CONFIG);

      FileBasedConfig config = new FileBasedConfig(certificatesConfigFile, FS.detect());

      if (certificatesConfigFile.exists()) {

         try {

            config.load();

         } catch (Exception e) {

            Utils.showException(GitblitAuthority.this, e);

         }

      }

      ucm.update(config);

      try {

         config.save();

      } catch (Exception e) {

         Utils.showException(GitblitAuthority.this, e);

      }

   }

}