Changeset 6683

Timestamp:

09/10/08 12:14:35 (5 years ago)

Author:

p_lindheimer

Message:

closes #3182 add fw_langpacks and associated publishing tools

Files:

• modules/branches/2.5/fw_langpacks (copied) (copied from modules/branches/2.5/fw_ari)
• modules/branches/2.5/fw_langpacks/install.php (copied) (copied from modules/branches/2.5/fw_ari/install.php) (3 diffs)
• modules/branches/2.5/fw_langpacks/module.xml (copied) (copied from modules/branches/2.5/fw_ari/module.xml) (1 diff)
• modules/branches/2.5/fw_langpackssvn.pl (copied) (copied from modules/branches/2.5/fw_arisvn.pl) (2 diffs)
• modules/branches/2.5/publish.pl (modified) (3 diffs)

modules/branches/2.5/fw_langpacks/install.php

@@ -3 +3 @@
-// HELPER FUNCTIONS:
-
-ari
-ari
+langpacks
+langpacks
-  foreach ($errors as $error) {
-    echo "$error<br />";
@@ -44 +44 @@
-
-global $amp_conf;
-global $asterisk_conf;
-
-$debug = false;
@@ -66 +65 @@
-
-/*
-
+
+
+
+
+
- */
+  $htdocs_source = dirname(__FILE__)."/htdocs";
+  $htdocs_dest = $amp_conf['AMPWEBROOT'];
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
-  }
-
+  // Now for each module we have, make sure the module is in the destination as we don't want to create
+  // empty destinatino folders with just i18n directories.
+  //
+  $dir = opendir($htdocs_source.'/admin/modules');
+  while ($file = readdir($dir)) {
+    if (is_dir("$htdocs_dest/admin/modules/$file") && ($file != ".") && ($file != "..")) {
+      out(sprintf(_("Preparing to copy %s to %s"),"$file","$htdocs_dest/admin/modules"));
+      $htdocs_copy[] = array("source" => "$htdocs_source/admin/modules/$file", "dest" => "$htdocs_dest/admin/modules");
+    } else if ($file != "." && $file != "..") {
+      out(sprintf(_("No destination directory %s to copy %s to"),"$htodcs_dest/modules/$file","$file"));
+    }
+  }
+
+  foreach ($htdocs_copy as $translations) {
+    exec("cp -ru ".$translations['source']." ".$translations['dest']." 2>&1",$out,$ret);
+    if ($ret != 0) {
+      fw_langpacks_print_errors($translations['source'], $translations['dest'], $out);
+    } else {
+      out(sprintf(_("Updated %s"),basename($translations['source'])));
+    }
+  }
-?>

modules/branches/2.5/fw_langpacks/module.xml

@@ -1 +1 @@
-<module>
-
-
-
-
-
+
+
+
-  <changelog>
-
-
-
-
+
-  </changelog>
-  <description>
-bug fixes to the ARI code that is not otherwise housed in a module, it used to be part of framework but has been removed to isolate ARI from Framework updates
+new and updated localization translations for all componets in FreePBX. Localization i18n translations are still kept with each module and other components such as the User Portal (ARI). This provides an easy ability to bring all components up-to-date without the need of publishing dozens of modules for every minor change. The localization updates used will be the latest available for all modules and will not consider the curent version you are running
-  </description>
-  <type>setup</type>
-  <category>Basic</category>
-ari-2.5.0.3
-d345aeed410ba8180dc7b877412b8d03
+langpacks-2.5.0
+4d31935ef78a53c3b70bb8ce32f0c8cd
-</module>

modules/branches/2.5/fw_langpackssvn.pl

@@ -2 +2 @@
-
-# This script (sculpted from publish.pl) will check the last tarball (which must be there)
-ari
-ari
+langpacks
+langpacks
-#
-$rver = "2.5";
-ari = "fw_ari
+langpacks = "fw_langpacks
-
-ari
+langpacks
-
-my $reldir = "release/";
@@ -25 +25 @@
-
-  # Now we know the version. Get the svnversion.txt from the last update.
-ari
+langpacks
-  print "CHECKING VERSION: ..... ";
-  #print "CHECKING VERSION WITH: tar -zxOf $filename $moddir/svnversion.txt: ...  ";
-  system("tar -zxOf ".$filename." ".$moddir."/svnversion.txt");
-
-
+
+
+
+
-
+
+  # Test calls
+  # system("svn log http://svn.freepbx.org/freepbx/branches/$rver/amp_conf/htdocs/recordings/locale -v -r 4000:HEAD | grep 'htdocs/recordings/locale'");
+  # system("svn log http://svn.freepbx.org/freepbx/branches/$rver/amp_conf/htdocs/admin -v -r 4000:HEAD | grep 'i18n/' | grep 'htdocs/admin'");
+  # system("svn log http://svn.freepbx.org/modules/branches/$rver -v -r 4000:HEAD | grep 'i18n/' | grep 'modules/branches'");

modules/branches/2.5/publish.pl

@@ -12 +12 @@
-$fw_fop = "fw_fop";
-$fw_ari = "fw_ari";
+$fw_langpacks = "fw_langpacks";
-
-my $reldir = "release/";
@@ -120 +121 @@
-    if (system("rm -rf $fw_ari/htdocs_ari/includes/main.conf.php")) {
-      die "FATAL: failed to trim main.conf.php ARI file\n";
+    }
+
+  }
+  if ($moddir =~ /$fw_langpacks/) {
+
+    my $module_url="http://svn.freepbx.org/modules/branches/$rver";
+    my $base_url="http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs";
+    my $framework_url="$base_url/admin";
+    my $recordings_url="$base_url/recordings";
+
+    @modules=`svn list $module_url | grep '/'`;
+
+    if (system("rm -rf $fw_langpacks/htdocs")) {
+      die "FATAL: failed to remove old htdocs dir\n";
+    }
+    if (system("mkdir -p $fw_langpacks/htdocs/admin/modules")) {
+      die "FATAL: failed to create htdocs/admin/modules\n";
+    }
+    if (system("mkdir -p $fw_langpacks/htdocs/recordings")) {
+      die "FATAL: failed to create htdocs/recordings\n";
+    }
+
+    if (system("svn export $framework_url/i18n $fw_langpacks/htdocs/admin/i18n")) {
+      die "FATAL: failed to export $framework_url/i18n\n";
+    }
+    if (system("svn export $recordings_url/locale $fw_langpacks/htdocs/recordings/locale")) {
+      die "FATAL: failed to export $recurdings_url/locale\n";
+    }
+    foreach my $module ( @modules ) {
+      chomp($module);
+      if (system("rm -rf $fw_langpacks/i18n")) {
+        die "FATAL: failed to remove temp i18n dir\n";
+      }
+      if (!system("svn export $module_url/$module"."i18n $fw_langpacks/i18n 2> /dev/null")) {
+        if (system("mkdir $fw_langpacks/htdocs/admin/modules/$module")) {
+          die "FATAL: failed to create htdocs/admin/modules/$module\n";
+        }
+        if (system("mv $fw_langpacks/i18n $fw_langpacks/htdocs/admin/modules/$module")) {
+          die "FATAL: failed to move i18n to htdocs/admin/modules/$module\n";
+        }
+      } else {
+        print "No i18n files for $module"."\n";
+      }
+    }
+
+
+    # Create the svnversion information for this framework snapshot
+    #
+    if (system("echo SVN VERSION: `svn log -q -r HEAD http://svn.freepbx.org/ | cut -s -f 1 -d ' ' | cut -b '2-'` > $fw_langpacks/svnversion.txt")) {
+      die "FATAL: svnversion failed to create svnversion.txt\n";
-    }
-
@@ -161 +212 @@
-      next if ($x =~ /module.xml/);
-      next if ($x =~ /htdocs_ari/);
+      next if ($x =~ /svnversion.txt/);
+      $files .= "$x ";
+  } elsif ($moddir =~ /$fw_langpacks/) {
+      next if ($x =~ /module.xml/);
+      next if ($x =~ /htdocs/);
-      next if ($x =~ /svnversion.txt/);
-      $files .= "$x ";