Permalink
Browse files

separate fake libintl to libintl-alternative

  • Loading branch information...
1 parent 94e7867 commit 0c418bfa2e31f9fcf4611b30a61c5c64f917a16a @youknowone youknowone committed Oct 26, 2012
Showing with 27 additions and 57 deletions.
  1. +3 −0 .gitmodules
  2. +22 −18 XChatAqua.xcodeproj/project.pbxproj
  3. +0 −11 gettext/libintl.h
  4. +0 −27 gettext/libintl.m
  5. +1 −1 glib
  6. +1 −0 libintl
View
@@ -16,3 +16,6 @@
[submodule "Resources/theme/Solarized"]
path = Resources/theme/Solarized
url = git://github.com/jtmohr/xchat-colors-solarized.git
+[submodule "libintl"]
+ path = libintl
+ url = git://github.com/youknowone/libintl-alternative.git
@@ -1064,7 +1064,6 @@
0FC8F4AE0DEEE51700504F31 /* libxchat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libxchat.a; sourceTree = BUILT_PRODUCTS_DIR; };
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
- 199FA26E6A554F1F875E34D3 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
2D6D421E121E85470082F2EF /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = "<group>"; };
@@ -2264,8 +2263,8 @@
38F06932163820B0002723AB /* libPods-XChat Azure.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libPods-XChat Azure.a"; path = "Pods/build/Debug/libPods-XChat Azure.a"; sourceTree = "<group>"; };
38F06934163820CA002723AB /* libPods-XChat Aqua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libPods-XChat Aqua.a"; path = "Pods/build/Debug/libPods-XChat Aqua.a"; sourceTree = "<group>"; };
38F069BE16386904002723AB /* gquark.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gquark.c; sourceTree = "<group>"; };
- 38F5BF6B15A9BA0E0075B0DF /* libintl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libintl.h; path = gettext/libintl.h; sourceTree = "<group>"; };
- 38F5BF6C15A9BA0E0075B0DF /* libintl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = libintl.m; path = gettext/libintl.m; sourceTree = "<group>"; };
+ 38F5BF6B15A9BA0E0075B0DF /* libintl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libintl.h; sourceTree = "<group>"; };
+ 38F5BF6C15A9BA0E0075B0DF /* libintl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = libintl.m; sourceTree = "<group>"; };
38FC92B813CAF449006CB5C8 /* am */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = am; path = am.lproj/xchat.strings; sourceTree = "<group>"; };
38FC92B913CAF449006CB5C8 /* az */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = az; path = az.lproj/xchat.strings; sourceTree = "<group>"; };
38FC92BA13CAF449006CB5C8 /* be */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = be; path = be.lproj/xchat.strings; sourceTree = "<group>"; };
@@ -2313,15 +2312,13 @@
38FC93C913CAF46E006CB5C8 /* locale */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locale; path = ../../Resources/locale; sourceTree = "<group>"; };
3B4D30B815F5314600704C98 /* XAFileUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XAFileUtil.h; path = Mac/XALibrary/XAFileUtil.h; sourceTree = "<group>"; };
3B4D30B915F5314600704C98 /* XAFileUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XAFileUtil.m; path = Mac/XALibrary/XAFileUtil.m; sourceTree = "<group>"; };
- 4581A5D270604E95AADD56B8 /* libPods-XChat Aqua.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-XChat Aqua.a"; sourceTree = BUILT_PRODUCTS_DIR; };
8D1107320486CEB800E47090 /* X-Chat Aqua.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "X-Chat Aqua.app"; sourceTree = BUILT_PRODUCTS_DIR; };
9B7C664CA2BB48DCB301BFA0 /* Pods-XChat Azure.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-XChat Azure.xcconfig"; path = "Pods/Pods-XChat Azure.xcconfig"; sourceTree = SOURCE_ROOT; };
B07C7AB20F4395E200E11B58 /* BuildNumber.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = BuildNumber.xcconfig; sourceTree = "<group>"; };
B07C7AD60F4398FC00E11B58 /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
B07C7AD70F4398FC00E11B58 /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
B0D937EF0FFB0D34009370B5 /* libcrypto.dylib */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; };
B0D937F00FFB0D34009370B5 /* libssl.dylib */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = /usr/lib/libssl.dylib; sourceTree = "<absolute>"; };
- C46ED6FB49AE45D086797781 /* libPods-XChat Azure.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-XChat Azure.a"; sourceTree = BUILT_PRODUCTS_DIR; };
C51F1E5CA23A49AE9CAEAEDF /* Pods-XChat Aqua.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-XChat Aqua.xcconfig"; path = "Pods/Pods-XChat Aqua.xcconfig"; sourceTree = SOURCE_ROOT; };
D406B462129D789400EF6B2B /* fe-aqua_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "fe-aqua_common.h"; sourceTree = "<group>"; };
D439129912DE2569009BE73C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Mac/Azure/Info.plist; sourceTree = "<group>"; };
@@ -2640,8 +2637,6 @@
29B97314FDCFA39411CA2CEA /* X-Chat Aqua */ = {
isa = PBXGroup;
children = (
- 38F06934163820CA002723AB /* libPods-XChat Aqua.a */,
- 38F06932163820B0002723AB /* libPods-XChat Azure.a */,
38CE5A85154A687300480EC6 /* ShortcutRecorder.xcodeproj */,
38CE5AA4154A70E100480EC6 /* Growl.xcodeproj */,
38771A4415A7C0090046929E /* Aqua */,
@@ -2668,9 +2663,8 @@
children = (
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
- 199FA26E6A554F1F875E34D3 /* libPods.a */,
- C46ED6FB49AE45D086797781 /* libPods-XChat Azure.a */,
- 4581A5D270604E95AADD56B8 /* libPods-XChat Aqua.a */,
+ 38F06934163820CA002723AB /* libPods-XChat Aqua.a */,
+ 38F06932163820B0002723AB /* libPods-XChat Azure.a */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -2800,6 +2794,15 @@
path = src;
sourceTree = "<group>";
};
+ 3855AF4B163AACAB005584CD /* libintl */ = {
+ isa = PBXGroup;
+ children = (
+ 38F5BF6B15A9BA0E0075B0DF /* libintl.h */,
+ 38F5BF6C15A9BA0E0075B0DF /* libintl.m */,
+ );
+ path = libintl;
+ sourceTree = "<group>";
+ };
385DCEF91558C260002FE467 /* xchat */ = {
isa = PBXGroup;
children = (
@@ -2812,8 +2815,7 @@
385F774A155158BB00689E6E /* staticlib */ = {
isa = PBXGroup;
children = (
- 38F5BF6B15A9BA0E0075B0DF /* libintl.h */,
- 38F5BF6C15A9BA0E0075B0DF /* libintl.m */,
+ 3855AF4B163AACAB005584CD /* libintl */,
385F782D15515BFD00689E6E /* glib */,
385DCEF91558C260002FE467 /* xchat */,
);
@@ -5746,7 +5748,7 @@
Mac,
xchat/src/common,
glib,
- gettext,
+ libintl,
);
OTHER_CFLAGS = (
"-I",
@@ -5770,7 +5772,7 @@
Mac,
xchat/src/common,
glib,
- gettext,
+ libintl,
);
OTHER_CFLAGS = (
"-I",
@@ -5957,6 +5959,7 @@
);
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = (
"GLIB_COMPILATION=1",
+ "ENABLE_NLS=1",
"LIBDIR=\\\"@loader_path/../Frameworks\\\"",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
@@ -5976,6 +5979,7 @@
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = (
"GLIB_COMPILATION=1",
+ "ENABLE_NLS=1",
"LIBDIR=\\\"@loader_path/../Frameworks\\\"",
);
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
@@ -6007,7 +6011,7 @@
"$(inherited)",
xchat/src/common,
glib,
- gettext,
+ libintl,
);
INFOPLIST_FILE = "$(TARGET_PLATFORM)/${PRODUCT_CODE}/Info.plist";
LIBRARY_SEARCH_PATHS = (
@@ -6041,7 +6045,7 @@
"$(inherited)",
xchat/src/common,
glib,
- gettext,
+ libintl,
);
INFOPLIST_FILE = "$(TARGET_PLATFORM)/${PRODUCT_CODE}/Info.plist";
LIBRARY_SEARCH_PATHS = (
@@ -6217,7 +6221,7 @@
"$(inherited)",
xchat/src,
glib,
- gettext,
+ libintl,
);
INFOPLIST_FILE = "$(TARGET_PLATFORM)/${PRODUCT_CODE}/Info.plist";
LIBRARY_SEARCH_PATHS = (
@@ -6252,7 +6256,7 @@
"$(inherited)",
xchat/src,
glib,
- gettext,
+ libintl,
);
INFOPLIST_FILE = "$(TARGET_PLATFORM)/${PRODUCT_CODE}/Info.plist";
LIBRARY_SEARCH_PATHS = (
View
@@ -1,11 +0,0 @@
-
-/* Fake gettext */
-char *gettext(char *cstring);
-char *dgettext(char *domain, char *cstring);
-char *dcgettext(char *domain, char *cstring, char *category);
-char *dngettext(char *domain, char *cstring, char *plural, long n);
-
-void bindtextdomain(const char *, const char *);
-void bind_textdomain_codeset(const char *, const char *);
-const char *textdomain(const char *);
-//void
View
@@ -1,27 +0,0 @@
-
-#import <Foundation/Foundation.h>
-#include "libintl.h"
-
-char *gettext(char *cstring) {
- return dgettext("xchat", cstring);
-}
-
-char *dgettext(char *domain, char *cstring) {
- NSString *sourceString = [NSString stringWithUTF8String:cstring];
- NSString *resultString = NSLocalizedStringFromTable(sourceString, [NSString stringWithUTF8String:domain], @"");
- return (char *)resultString.UTF8String;
-}
-
-char *dcgettext(char *domain, char *cstring, char *category) {
- return dgettext(domain, cstring);
-}
-
-char *dngettext(char *domain, char *cstring, char *plural, long n) {
- return dgettext(domain, cstring);
-}
-
-void bindtextdomain(const char *foo, const char *bar) { }
-
-void bind_textdomain_codeset(const char *foo, const char *bar) { }
-
-const char *textdomain(const char *foo) { return "xchat"; }
2 glib
Submodule glib updated 1 files
+1 −1 config.h
Submodule libintl added at c72969

0 comments on commit 0c418bf

Please sign in to comment.