From: <did...@us...> - 2008-10-27 14:18:50
|
Revision: 1859 http://omegat.svn.sourceforge.net/omegat/?rev=1859&view=rev Author: didierbr Date: 2008-10-27 14:18:48 +0000 (Mon, 27 Oct 2008) Log Message: ----------- [ 2200872 ] Vista: wrong location of configuration files Modified Paths: -------------- branches/release-1-8/release/changes.txt branches/release-1-8/src/org/omegat/util/StaticUtils.java Modified: branches/release-1-8/release/changes.txt =================================================================== --- branches/release-1-8/release/changes.txt 2008-10-27 13:54:47 UTC (rev 1858) +++ branches/release-1-8/release/changes.txt 2008-10-27 14:18:48 UTC (rev 1859) @@ -3,7 +3,6 @@ ---------------------------------------------------------------------- 1.8.1 vs. 1.8.0 update 2 - 8 Enhancements 1 Bugfixe ---------------------------------------------------------------------- @@ -31,13 +30,15 @@ Bug fixes: - Extra space in each segment in the German localization http://sourceforge.net/support/tracker.php?aid=2169447 + - Vista: wrong location of configuration files + http://sourceforge.net/support/tracker.php?aid=2200872 + ---------------------------------------------------------------------- OmegaT 1.8.0 update 2 Changes ---------------------------------------------------------------------- 1.8.0 update 2 vs. 1.8.0 update 1 - 3 Enhancements 4 Bugfixes ---------------------------------------------------------------------- Modified: branches/release-1-8/src/org/omegat/util/StaticUtils.java =================================================================== --- branches/release-1-8/src/org/omegat/util/StaticUtils.java 2008-10-27 13:54:47 UTC (rev 1858) +++ branches/release-1-8/src/org/omegat/util/StaticUtils.java 2008-10-27 14:18:48 UTC (rev 1859) @@ -495,7 +495,8 @@ * configuration directory is being determined, an empty string will * be returned, resulting in the current working directory being used. * - * Windows: <Documents and Settings>\<User name>\Application Data\OmegaT + * Windows XP : <Documents and Settings>\<User name>\Application Data\OmegaT + * Windows Vista : User\<User name>\AppData\Roaming * Linux: <User Home>/.omegat * Solaris/SunOS: <User Home>/.omegat * FreeBSD: <User Home>/.omegat @@ -554,15 +555,19 @@ // check for Windows versions if (os.startsWith("Windows")) // NOI18N { - // get the user's application data directory through the environment - // variable %APPDATA%, which usually points to the directory + // Trying to locate "Application Data" for 2000 and XP // C:\Documents and Settings\<User>\Application Data + // We do not use %APPDATA% File appDataFile = new File(home, "Application Data"); // NOI18N - String appData; + String appData = null; if (appDataFile.exists()) appData = appDataFile.getAbsolutePath(); - else - appData = null; // NOI18N + else // No "Application Data", we're trying Vista + { + File appDataFileVista = new File(home, "AppData\\Roaming"); // NOI18N + if (appDataFileVista.exists()) + appData = appDataFileVista.getAbsolutePath(); + } if ((appData != null) && (appData.length() > 0)) { @@ -573,8 +578,8 @@ else { // otherwise set the config dir to the user's home directory, usually - // C:\Documents and Settings\<User>\ - m_configDir = home + File.separator; + // C:\Documents and Settings\<User>\OmegaT + m_configDir = home + WINDOWS_CONFIG_DIR; } } // Check for UNIX varieties This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |