Browse Source

rev update, fix autoname test "random" failure

tags/3.0
friendica 7 years ago
parent
commit
78579627ce
3 changed files with 35 additions and 32 deletions
  1. 1
    1
      boot.php
  2. 5
    2
      tests/autoname_test.php
  3. 29
    29
      util/messages.po

+ 1
- 1
boot.php View File

@@ -9,7 +9,7 @@ require_once('include/nav.php');
9 9
 require_once('include/cache.php');
10 10
 
11 11
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
12
-define ( 'FRIENDICA_VERSION',      '2.3.1322' );
12
+define ( 'FRIENDICA_VERSION',      '2.3.1323' );
13 13
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
14 14
 define ( 'DB_UPDATE_VERSION',      1138      );
15 15
 

+ 5
- 2
tests/autoname_test.php View File

@@ -67,7 +67,10 @@ class AutonameTest extends PHPUnit_Framework_TestCase {
67 67
 		
68 68
 		$autoname2=autoname(1);
69 69
 		$this->assertEquals(1, count($autoname2));
70
-		
71
-		$this->assertFalse($autoname1==$autoname2); 
70
+
71
+		// The following test is problematic, with only 26 possibilities
72
+		// generating the same thing twice happens often aka
73
+		// birthday paradox
74
+//		$this->assertFalse($autoname1==$autoname2); 
72 75
 	}
73 76
 }

+ 29
- 29
util/messages.po View File

@@ -6,9 +6,9 @@
6 6
 #, fuzzy
7 7
 msgid ""
8 8
 msgstr ""
9
-"Project-Id-Version: 2.3.1322\n"
9
+"Project-Id-Version: 2.3.1323\n"
10 10
 "Report-Msgid-Bugs-To: \n"
11
-"POT-Creation-Date: 2012-04-24 10:00-0700\n"
11
+"POT-Creation-Date: 2012-04-25 10:00-0700\n"
12 12
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -218,7 +218,7 @@ msgid "link to source"
218 218
 msgstr ""
219 219
 
220 220
 #: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:250
221
-#: ../../include/nav.php:52 ../../boot.php:1471
221
+#: ../../include/nav.php:52 ../../boot.php:1481
222 222
 msgid "Events"
223 223
 msgstr ""
224 224
 
@@ -531,7 +531,7 @@ msgstr ""
531 531
 
532 532
 #: ../../mod/photos.php:1214 ../../mod/editpost.php:104
533 533
 #: ../../mod/wallmessage.php:145 ../../mod/message.php:188
534
-#: ../../mod/message.php:357 ../../include/conversation.php:361
534
+#: ../../mod/message.php:380 ../../include/conversation.php:361
535 535
 #: ../../include/conversation.php:698 ../../include/conversation.php:975
536 536
 msgid "Please wait"
537 537
 msgstr ""
@@ -629,7 +629,7 @@ msgid "Edit"
629 629
 msgstr ""
630 630
 
631 631
 #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
632
-#: ../../mod/message.php:186 ../../mod/message.php:355
632
+#: ../../mod/message.php:186 ../../mod/message.php:378
633 633
 #: ../../include/conversation.php:957
634 634
 msgid "Upload photo"
635 635
 msgstr ""
@@ -639,7 +639,7 @@ msgid "Attach file"
639 639
 msgstr ""
640 640
 
641 641
 #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
642
-#: ../../mod/message.php:187 ../../mod/message.php:356
642
+#: ../../mod/message.php:187 ../../mod/message.php:379
643 643
 #: ../../include/conversation.php:961
644 644
 msgid "Insert web link"
645 645
 msgstr ""
@@ -2249,7 +2249,7 @@ msgstr ""
2249 2249
 msgid "Invalid contact."
2250 2250
 msgstr ""
2251 2251
 
2252
-#: ../../mod/notes.php:44 ../../boot.php:1476
2252
+#: ../../mod/notes.php:44 ../../boot.php:1486
2253 2253
 msgid "Personal Notes"
2254 2254
 msgstr ""
2255 2255
 
@@ -2306,17 +2306,17 @@ msgid ""
2306 2306
 msgstr ""
2307 2307
 
2308 2308
 #: ../../mod/wallmessage.php:133 ../../mod/message.php:178
2309
-#: ../../mod/message.php:347
2309
+#: ../../mod/message.php:370
2310 2310
 msgid "To:"
2311 2311
 msgstr ""
2312 2312
 
2313 2313
 #: ../../mod/wallmessage.php:134 ../../mod/message.php:179
2314
-#: ../../mod/message.php:348
2314
+#: ../../mod/message.php:371
2315 2315
 msgid "Subject:"
2316 2316
 msgstr ""
2317 2317
 
2318 2318
 #: ../../mod/wallmessage.php:140 ../../mod/message.php:183
2319
-#: ../../mod/message.php:351 ../../mod/invite.php:113
2319
+#: ../../mod/message.php:374 ../../mod/invite.php:113
2320 2320
 msgid "Your message:"
2321 2321
 msgstr ""
2322 2322
 
@@ -2500,7 +2500,7 @@ msgstr ""
2500 2500
 
2501 2501
 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:247
2502 2502
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
2503
-#: ../../include/nav.php:50 ../../boot.php:1458
2503
+#: ../../include/nav.php:50 ../../boot.php:1468
2504 2504
 msgid "Profile"
2505 2505
 msgstr ""
2506 2506
 
@@ -2715,7 +2715,7 @@ msgid "Access denied."
2715 2715
 msgstr ""
2716 2716
 
2717 2717
 #: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:249
2718
-#: ../../include/nav.php:51 ../../boot.php:1463
2718
+#: ../../include/nav.php:51 ../../boot.php:1473
2719 2719
 msgid "Photos"
2720 2720
 msgstr ""
2721 2721
 
@@ -2890,7 +2890,7 @@ msgstr ""
2890 2890
 msgid "%s and You"
2891 2891
 msgstr ""
2892 2892
 
2893
-#: ../../mod/message.php:242 ../../mod/message.php:340
2893
+#: ../../mod/message.php:242 ../../mod/message.php:363
2894 2894
 msgid "Delete conversation"
2895 2895
 msgstr ""
2896 2896
 
@@ -2909,17 +2909,17 @@ msgstr[1] ""
2909 2909
 msgid "Message not available."
2910 2910
 msgstr ""
2911 2911
 
2912
-#: ../../mod/message.php:324
2912
+#: ../../mod/message.php:347
2913 2913
 msgid "Delete message"
2914 2914
 msgstr ""
2915 2915
 
2916
-#: ../../mod/message.php:342
2916
+#: ../../mod/message.php:365
2917 2917
 msgid ""
2918 2918
 "No secure communications available. You <strong>may</strong> be able to "
2919 2919
 "respond from the sender's profile page."
2920 2920
 msgstr ""
2921 2921
 
2922
-#: ../../mod/message.php:346
2922
+#: ../../mod/message.php:369
2923 2923
 msgid "Send Reply"
2924 2924
 msgstr ""
2925 2925
 
@@ -6064,7 +6064,7 @@ msgstr ""
6064 6064
 msgid "End this session"
6065 6065
 msgstr ""
6066 6066
 
6067
-#: ../../include/nav.php:49 ../../boot.php:1453
6067
+#: ../../include/nav.php:49 ../../boot.php:1463
6068 6068
 msgid "Status"
6069 6069
 msgstr ""
6070 6070
 
@@ -6827,34 +6827,34 @@ msgstr ""
6827 6827
 msgid "Message"
6828 6828
 msgstr ""
6829 6829
 
6830
-#: ../../boot.php:1151 ../../boot.php:1223
6830
+#: ../../boot.php:1151 ../../boot.php:1227
6831 6831
 msgid "g A l F d"
6832 6832
 msgstr ""
6833 6833
 
6834
-#: ../../boot.php:1152 ../../boot.php:1224
6834
+#: ../../boot.php:1152 ../../boot.php:1228
6835 6835
 msgid "F d"
6836 6836
 msgstr ""
6837 6837
 
6838
-#: ../../boot.php:1177
6838
+#: ../../boot.php:1197 ../../boot.php:1268
6839
+msgid "[today]"
6840
+msgstr ""
6841
+
6842
+#: ../../boot.php:1209
6839 6843
 msgid "Birthday Reminders"
6840 6844
 msgstr ""
6841 6845
 
6842
-#: ../../boot.php:1178
6846
+#: ../../boot.php:1210
6843 6847
 msgid "Birthdays this week:"
6844 6848
 msgstr ""
6845 6849
 
6846
-#: ../../boot.php:1201 ../../boot.php:1266
6847
-msgid "[today]"
6850
+#: ../../boot.php:1261
6851
+msgid "[No description]"
6848 6852
 msgstr ""
6849 6853
 
6850
-#: ../../boot.php:1247
6854
+#: ../../boot.php:1279
6851 6855
 msgid "Event Reminders"
6852 6856
 msgstr ""
6853 6857
 
6854
-#: ../../boot.php:1248
6858
+#: ../../boot.php:1280
6855 6859
 msgid "Events this week:"
6856 6860
 msgstr ""
6857
-
6858
-#: ../../boot.php:1260
6859
-msgid "[No description]"
6860
-msgstr ""

Loading…
Cancel
Save