Revision: 6565
http://skim-app.svn.sourceforge.net/skim-app/?rev=6565&view=rev
Author: hofman
Date: 2010-05-26 17:12:57 +0000 (Wed, 26 May 2010)
Log Message:
-----------
reduce arguments in macro
Modified Paths:
--------------
trunk/SKLocalization.m
Modified: trunk/SKLocalization.m
===================================================================
--- trunk/SKLocalization.m 2010-05-26 09:24:48 UTC (rev 6564)
+++ trunk/SKLocalization.m 2010-05-26 17:12:57 UTC (rev 6565)
@@ -45,18 +45,18 @@
return [[NSBundle mainBundle] localizedStringForKey:string value:string
table:table];
}
-#define LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(object, table, property) \
+#define LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(property, table) \
do { \
- NSString *value = localizedStringFromTable(object.property, table); \
- if (value) object.property = value; \
+ NSString *value = localizedStringFromTable(property, table); \
+ if (value) property = value; \
} while (0)
-#define localizeTitleForObjectFromTable(object, table)
LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(object, table, title)
-#define localizeAlternateTitleForObjectFromTable(object, table)
LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(object, table, alternateTitle)
-#define localizeStringValueForObjectFromTable(object, table)
LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(object, table, stringValue)
-#define localizePlaceholderStringForObjectFromTable(object, table)
LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(object, table, placeholderString)
-#define localizeLabelForObjectFromTable(object, table)
LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(object, table, label)
-#define localizeToolTipForObjectFromTable(object, table)
LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(object, table, toolTip)
+#define localizeTitleForObjectFromTable(object, table)
LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(object.title, table)
+#define localizeAlternateTitleForObjectFromTable(object, table)
LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(object.alternateTitle, table)
+#define localizeStringValueForObjectFromTable(object, table)
LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(object.stringValue, table)
+#define localizePlaceholderStringForObjectFromTable(object, table)
LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(object.placeholderString, table)
+#define localizeLabelForObjectFromTable(object, table)
LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(object.label, table)
+#define localizeToolTipForObjectFromTable(object, table)
LOCALIZE_STRING_FOR_OBJECT_FROM_TABLE(object.toolTip, table)
@implementation NSObject (SKLocalization)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit