@@ -367,6 +367,30 @@ public function test__() {
367
367
$ result = __ ('Plural Rule 1 (from core) ' );
368
368
$ expected = 'Plural Rule 1 (from core translated) ' ;
369
369
$ this ->assertEqual ($ result , $ expected );
370
+
371
+ $ result = __ ('Some string with %s ' , 'arguments ' );
372
+ $ expected = 'Some string with arguments ' ;
373
+ $ this ->assertEqual ($ result , $ expected );
374
+
375
+ $ result = __ ('Some string with %s %s ' , 'multiple ' , 'arguments ' );
376
+ $ expected = 'Some string with multiple arguments ' ;
377
+ $ this ->assertEqual ($ result , $ expected );
378
+
379
+ $ result = __ ('Some string with %s %s ' , array ('multiple ' , 'arguments ' ));
380
+ $ expected = 'Some string with multiple arguments ' ;
381
+ $ this ->assertEqual ($ result , $ expected );
382
+
383
+ $ result = __ ('Testing %2$s %1$s ' , 'order ' , 'different ' );
384
+ $ expected = 'Testing different order ' ;
385
+ $ this ->assertEqual ($ result , $ expected );
386
+
387
+ $ result = __ ('Testing %2$s %1$s ' , array ('order ' , 'different ' ));
388
+ $ expected = 'Testing different order ' ;
389
+ $ this ->assertEqual ($ result , $ expected );
390
+
391
+ $ result = __ ('Testing %.2f number ' , 1.2345 );
392
+ $ expected = 'Testing 1.23 number ' ;
393
+ $ this ->assertEqual ($ result , $ expected );
370
394
}
371
395
372
396
/**
@@ -388,6 +412,18 @@ public function test__n() {
388
412
$ result = __n ('%d = 1 (from core) ' , '%d = 0 or > 1 (from core) ' , 2 );
389
413
$ expected = '%d = 0 or > 1 (from core translated) ' ;
390
414
$ this ->assertEqual ($ result , $ expected );
415
+
416
+ $ result = __n ('%d item. ' , '%d items. ' , 1 , 1 );
417
+ $ expected = '1 item. ' ;
418
+ $ this ->assertEqual ($ result , $ expected );
419
+
420
+ $ result = __n ('%d item for id %s ' , '%d items for id %s ' , 2 , 2 , '1234 ' );
421
+ $ expected = '2 items for id 1234 ' ;
422
+ $ this ->assertEqual ($ result , $ expected );
423
+
424
+ $ result = __n ('%d item for id %s ' , '%d items for id %s ' , 2 , array (2 , '1234 ' ));
425
+ $ expected = '2 items for id 1234 ' ;
426
+ $ this ->assertEqual ($ result , $ expected );
391
427
}
392
428
393
429
/**
@@ -409,6 +445,18 @@ public function test__d() {
409
445
$ result = __d ('core ' , 'Plural Rule 1 (from core) ' );
410
446
$ expected = 'Plural Rule 1 (from core translated) ' ;
411
447
$ this ->assertEqual ($ result , $ expected );
448
+
449
+ $ result = __d ('core ' , 'Some string with %s ' , 'arguments ' );
450
+ $ expected = 'Some string with arguments ' ;
451
+ $ this ->assertEqual ($ result , $ expected );
452
+
453
+ $ result = __d ('core ' , 'Some string with %s %s ' , 'multiple ' , 'arguments ' );
454
+ $ expected = 'Some string with multiple arguments ' ;
455
+ $ this ->assertEqual ($ result , $ expected );
456
+
457
+ $ result = __d ('core ' , 'Some string with %s %s ' , array ('multiple ' , 'arguments ' ));
458
+ $ expected = 'Some string with multiple arguments ' ;
459
+ $ this ->assertEqual ($ result , $ expected );
412
460
}
413
461
414
462
/**
@@ -435,6 +483,17 @@ public function test__dn() {
435
483
$ expected = '%d = 1 (translated) ' ;
436
484
$ this ->assertEqual ($ result , $ expected );
437
485
486
+ $ result = __dn ('core ' , '%d item. ' , '%d items. ' , 1 , 1 );
487
+ $ expected = '1 item. ' ;
488
+ $ this ->assertEqual ($ result , $ expected );
489
+
490
+ $ result = __dn ('core ' , '%d item for id %s ' , '%d items for id %s ' , 2 , 2 , '1234 ' );
491
+ $ expected = '2 items for id 1234 ' ;
492
+ $ this ->assertEqual ($ result , $ expected );
493
+
494
+ $ result = __dn ('core ' , '%d item for id %s ' , '%d items for id %s ' , 2 , array (2 , '1234 ' ));
495
+ $ expected = '2 items for id 1234 ' ;
496
+ $ this ->assertEqual ($ result , $ expected );
438
497
}
439
498
440
499
/**
@@ -452,6 +511,18 @@ public function test__c() {
452
511
$ result = __c ('Plural Rule 1 (from core) ' , 6 );
453
512
$ expected = 'Plural Rule 1 (from core translated) ' ;
454
513
$ this ->assertEqual ($ result , $ expected );
514
+
515
+ $ result = __c ('Some string with %s ' , 6 , 'arguments ' );
516
+ $ expected = 'Some string with arguments ' ;
517
+ $ this ->assertEqual ($ result , $ expected );
518
+
519
+ $ result = __c ('Some string with %s %s ' , 6 , 'multiple ' , 'arguments ' );
520
+ $ expected = 'Some string with multiple arguments ' ;
521
+ $ this ->assertEqual ($ result , $ expected );
522
+
523
+ $ result = __c ('Some string with %s %s ' , 6 , array ('multiple ' , 'arguments ' ));
524
+ $ expected = 'Some string with multiple arguments ' ;
525
+ $ this ->assertEqual ($ result , $ expected );
455
526
}
456
527
457
528
/**
@@ -477,6 +548,18 @@ public function test__dc() {
477
548
$ result = __dc ('core ' , 'Plural Rule 1 (from core) ' , 6 );
478
549
$ expected = 'Plural Rule 1 (from core translated) ' ;
479
550
$ this ->assertEqual ($ result , $ expected );
551
+
552
+ $ result = __dc ('core ' , 'Some string with %s ' , 6 , 'arguments ' );
553
+ $ expected = 'Some string with arguments ' ;
554
+ $ this ->assertEqual ($ result , $ expected );
555
+
556
+ $ result = __dc ('core ' , 'Some string with %s %s ' , 6 , 'multiple ' , 'arguments ' );
557
+ $ expected = 'Some string with multiple arguments ' ;
558
+ $ this ->assertEqual ($ result , $ expected );
559
+
560
+ $ result = __dc ('core ' , 'Some string with %s %s ' , 6 , array ('multiple ' , 'arguments ' ));
561
+ $ expected = 'Some string with multiple arguments ' ;
562
+ $ this ->assertEqual ($ result , $ expected );
480
563
}
481
564
482
565
/**
@@ -498,6 +581,18 @@ public function test__dcn() {
498
581
$ result = __dcn ('core ' , '%d = 1 ' , '%d = 0 or > 1 ' , 0 , 6 );
499
582
$ expected = '%d = 0 or > 1 ' ;
500
583
$ this ->assertEqual ($ result , $ expected );
584
+
585
+ $ result = __dcn ('core ' , '%d item. ' , '%d items. ' , 1 , 6 , 1 );
586
+ $ expected = '1 item. ' ;
587
+ $ this ->assertEqual ($ result , $ expected );
588
+
589
+ $ result = __dcn ('core ' , '%d item for id %s ' , '%d items for id %s ' , 2 , 6 , 2 , '1234 ' );
590
+ $ expected = '2 items for id 1234 ' ;
591
+ $ this ->assertEqual ($ result , $ expected );
592
+
593
+ $ result = __dcn ('core ' , '%d item for id %s ' , '%d items for id %s ' , 2 , 6 , array (2 , '1234 ' ));
594
+ $ expected = '2 items for id 1234 ' ;
595
+ $ this ->assertEqual ($ result , $ expected );
501
596
}
502
597
503
598
/**
0 commit comments